diff options
| author | Bram Moolenaar <bram@vim.org> | 2011-02-09 17:09:30 +0100 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2011-02-09 17:09:30 +0100 |
| commit | a820f779681afc0ce26b198bbc8e16210df499e9 (patch) | |
| tree | 6a6f87d9f2a819ac81dd9fdf53b5e3908cfd12e3 | |
| parent | 3129392839a44961d20d37a4fc3881b2a2d20b66 (diff) | |
| download | vim-7-3-116.tar.gz | |
Problem: 'cursorline' is displayed too short when there are concealed
characters and 'list' is set. (Dennis Preiser)
Solution: Check for 'cursorline' when 'list' is set. (Christian Brabandt)
| -rw-r--r-- | src/screen.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/screen.c b/src/screen.c index 1726fac8..ab08cf74 100644 --- a/src/screen.c +++ b/src/screen.c @@ -5099,7 +5099,11 @@ win_line(wp, lnum, startrow, endrow, nochange) #ifdef FEAT_DIFF || filler_todo > 0 #endif - || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str) + || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str +#ifdef FEAT_SYN_HL + && !wp->w_p_cul +#endif + ) || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL))) ) { diff --git a/src/version.c b/src/version.c index 6c1bc857..be30affd 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 116, +/**/ 115, /**/ 114, |