diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-01-13 22:01:56 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-01-13 22:01:56 -0500 |
| commit | 59e1f8996dcfbe9f5adc8b5106fa816f9afc6af6 (patch) | |
| tree | fee8acb541bf877bd0bd5fb28a80fcffeaa4a91a /src | |
| parent | 573d65c738dd2e5f4ee92a7f20946411206021f7 (diff) | |
| parent | da9e519ba1956ca4aac887c000134017ff2d243b (diff) | |
| download | rneovim-59e1f8996dcfbe9f5adc8b5106fa816f9afc6af6.tar.gz rneovim-59e1f8996dcfbe9f5adc8b5106fa816f9afc6af6.tar.bz2 rneovim-59e1f8996dcfbe9f5adc8b5106fa816f9afc6af6.zip | |
Merge pull request #4008 from brcolow/vim-7.4.721
Vim 7.4.721
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/screen.c | 7 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c index 977dd5b2d4..1ae2822a93 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -3459,7 +3459,7 @@ win_line ( c = ' '; } } else if (c == NUL - && ((wp->w_p_list && lcs_eol > 0) + && (wp->w_p_list || ((fromcol >= 0 || fromcol_prev >= 0) && tocol > vcol && VIsual_mode != Ctrl_V @@ -3486,10 +3486,11 @@ win_line ( c_extra = NUL; } } - if (wp->w_p_list) + if (wp->w_p_list && lcs_eol > 0) { c = lcs_eol; - else + } else { c = ' '; + } lcs_eol_one = -1; --ptr; /* put it back at the NUL */ if (!attr_pri) { diff --git a/src/nvim/version.c b/src/nvim/version.c index 804f750e18..da3ee09429 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -403,7 +403,7 @@ static int included_patches[] = { // 724 NA 723, // 722, - // 721, + 721, // 720 NA 719, // 718, |