patch 7.4.729

Problem:    Occasional crash with 'list' set.
Solution:   Fix off-by-one error. (Christian Brabandt)

diff --git a/src/screen.c b/src/screen.c
index 3f3123adbd7c2d713ec996fd93d63b2f58487954..917a0eaa923a9dca18407b1c5e3235961954a87a 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -4715,7 +4715,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
                                && !(noinvcur
                                    && lnum == wp->w_cursor.lnum
                                    && (colnr_T)vcol == wp->w_virtcol)))
-                       && lcs_eol_one >= 0)
+                       && lcs_eol_one > 0)
                {
                    /* Display a '$' after the line or highlight an extra
                     * character if the line break is included. */

diff --git a/src/version.c b/src/version.c
index b469a6ddff1aa57020e22cc4ade435f5e75889a0..355aa06f20729639e6283f72dad459882b2553a9 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    729,
 /**/
     728,
 /**/