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 1726fac82a36cb68d8c919ec441e11c35c4a6207..ab08cf74def5d229c58a9b8f3e718845ca99805d 100644 (file)
--- 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 6c1bc857f9af9481b02f288fbe209987c11ac269..be30affd3a1075afa8d241b0805af1a6b6697544 100644 (file)
--- 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,
 /**/