From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 9 Feb 2011 16:09:30 +0000 (+0100)
Subject: updated for version 7.3.116
X-Git-Tag: v7.3.116
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5ec3aea854387a5bfc02938546f5e8bd057e0113;p=vim

updated for version 7.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)
---

diff --git a/src/screen.c b/src/screen.c
index 1726fac82..ab08cf74d 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 6c1bc857f..be30affd3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    116,
 /**/
     115,
 /**/