IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3848 from Shougo/vim-7.4.665

Browse Source 
vim-patch:7.4.665
vim-patch:7.4.671
This commit is contained in:
Justin M. Keyes 2015-12-15 21:54:22 -05:00
commit 75cfd3c0ca
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/screen.c
View File

@ -3323,16 +3323,15 @@ win_line (
* Found last space before word: check for line break. * Found last space before word: check for line break.
*/ */
if (wp->w_p_lbr && vim_isbreak(c) && !vim_isbreak(*ptr)) { if (wp->w_p_lbr && vim_isbreak(c) && !vim_isbreak(*ptr)) {
char_u *p = ptr - ( int mb_off = has_mbyte ? (*mb_head_off)(line, ptr - 1) : 0;
has_mbyte ? mb_l : char_u *p = ptr - (mb_off + 1);
1);
// TODO: is passing p for start of the line OK? // TODO: is passing p for start of the line OK?
n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol, NULL) - 1; n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol, NULL) - 1;
if (c == TAB && n_extra + col > wp->w_width) { if (c == TAB && n_extra + col > wp->w_width) {
n_extra = (int)wp->w_buffer->b_p_ts n_extra = (int)wp->w_buffer->b_p_ts
- vcol % (int)wp->w_buffer->b_p_ts - 1; - vcol % (int)wp->w_buffer->b_p_ts - 1;
} }
c_extra = ' '; c_extra = mb_off > 0 ? MB_FILLER_CHAR : ' ';
if (ascii_iswhite(c)) { if (ascii_iswhite(c)) {
if (c == TAB) if (c == TAB)
/* See "Tab alignment" below. */ /* See "Tab alignment" below. */

4
src/nvim/version.c
View File

@ -322,13 +322,13 @@ static int included_patches[] = {
// 674 NA // 674 NA
673, 673,
// 672, // 672,
// 671, 671,
670, 670,
// 669 NA // 669 NA
668, 668,
667, 667,
// 666 NA // 666 NA
// 665, 665,
// 664 NA // 664 NA
// 663 NA // 663 NA
// 662, // 662,