mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-26 12:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4008 from brcolow/vim-7.4.721

Browse Source 
Vim 7.4.721
This commit is contained in:
Justin M. Keyes
2016-01-13 22:01:56 -05:00
parent 573d65c738 da9e519ba1
commit 59e1f8996d
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/screen.c
View File

@@ -3459,7 +3459,7 @@ win_line (
c = ' '; c = ' ';
} }
} else if (c == NUL } else if (c == NUL
&& ((wp->w_p_list && lcs_eol > 0) && (wp->w_p_list
|| ((fromcol >= 0 || fromcol_prev >= 0) || ((fromcol >= 0 || fromcol_prev >= 0)
&& tocol > vcol && tocol > vcol
&& VIsual_mode != Ctrl_V && VIsual_mode != Ctrl_V
@@ -3486,10 +3486,11 @@ win_line (
c_extra = NUL; c_extra = NUL;
} }
} }
if (wp->w_p_list) if (wp->w_p_list && lcs_eol > 0) {
c = lcs_eol; c = lcs_eol;
else } else {
c = ' '; c = ' ';
}
lcs_eol_one = -1; lcs_eol_one = -1;
--ptr; /* put it back at the NUL */ --ptr; /* put it back at the NUL */
if (!attr_pri) { if (!attr_pri) {

2
src/nvim/version.c
View File

@@ -403,7 +403,7 @@ static int included_patches[] = {
// 724 NA // 724 NA
723, 723,
// 722, // 722,
// 721, 721,
// 720 NA // 720 NA
719, 719,
// 718, // 718,