commit 5bbc21de819567f2ab8aa4ef8e154b7eaa73ff83
author Bram Moolenaar <Bram@vim.org> Sun Mar 09 13:30:56 2008 +0000
committer Bram Moolenaar <Bram@vim.org> Sun Mar 09 13:30:56 2008 +0000
tree 2e6c33d84fafb4ca7dfe5c6cbb60bee9480876f4
parent e3b3f28db9f438e8b67495b152ce483807312cea

updated for version 7.1-268

src/screen.c

diff --git a/src/screen.c b/src/screen.c
index a739927..7be34fa 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4527,7 +4527,7 @@
 #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;

src/version.c

diff --git a/src/version.c b/src/version.c
index d3bd54a..d9150a9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    268,
+/**/
     267,
 /**/
     266,