updated for version 7.1-268

diff --git a/src/screen.c b/src/screen.c
index a739927254d086c856220808795960de720e5a6d..7be34fa99b315c4a7120f3662031ca588ff83f0a 100644 (file)
--- 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 d3bd54a104e6ce05fdcc8ce4890e2e1a9dca99cf..d9150a90befda0de16e7608e5e52ab443eeda1c0 100644 (file)
--- 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,
 /**/