summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2011-02-09 17:09:30 +0100
committerBram Moolenaar <Bram@vim.org>2011-02-09 17:09:30 +0100
commit5ec3aea854387a5bfc02938546f5e8bd057e0113 (patch)
treea92bdb8e13ebbe59b3533cb07af375e348dc3bef
parentd58e929fa283459957b0eab635fdaa9dcd61819c (diff)
updated for version 7.3.116v7.3.116
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.c6
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/screen.c b/src/screen.c
index 1726fac82a..ab08cf74de 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 6c1bc857f9..be30affd3a 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,