From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 9 Mar 2008 13:30:56 +0000 (+0000)
Subject: updated for version 7.1-268
X-Git-Tag: v7.1.268
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5bbc21de819567f2ab8aa4ef8e154b7eaa73ff83;p=thirdparty%2Fvim.git

updated for version 7.1-268
---

diff --git a/src/screen.c b/src/screen.c
index a739927254..7be34fa99b 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4527,7 +4527,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
 #endif
 		    col == W_WIDTH(wp) - 1)
 		&& (*ptr != NUL
-		    || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str)
+		    || (wp->w_p_list && lcs_eol_one > 0)
 		    || (n_extra && (c_extra != NUL || *p_extra != NUL))))
 	{
 	    c = lcs_ext;
diff --git a/src/version.c b/src/version.c
index d3bd54a104..d9150a90be 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    268,
 /**/
     267,
 /**/