From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 22 Mar 2011 12:29:24 +0000 (+0100)
Subject: updated for version 7.3.140
X-Git-Tag: v7.3.140
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e9d4b58dda5ce38389617079722cf9bfcd966599;p=vim

updated for version 7.3.140
Problem:    Crash when drawing the "$" at end-of-line for list mode just after
            the window border and 'cursorline' is set.
Solution:   Don't check for 'cursorline'. (Quentin Carbonneaux)
---

diff --git a/src/screen.c b/src/screen.c
index ab08cf74d..1726fac82 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -5099,11 +5099,7 @@ 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
-#ifdef FEAT_SYN_HL
-			   && !wp->w_p_cul
-#endif
-			)
+		    || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str)
 		    || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL)))
 		)
 	{
diff --git a/src/version.c b/src/version.c
index 30ab39a08..d24bf7dba 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 */
+/**/
+    140,
 /**/
     139,
 /**/