# HG changeset patch
# User Bram Moolenaar <bram@vim.org>
# Date 1297267770 -3600
# Node ID bb3661a2eccc165bd5d2a87a8d4696f89431a459
# Parent  b6471224d2af33eb882910dd90385e995032cecb
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
--- a/src/screen.c
+++ b/src/screen.c
@@ -5099,7 +5099,11 @@ win_line(wp, lnum, startrow, endrow, noc
 #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
--- 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,