updated for version 7.1-154

diff --git a/src/screen.c b/src/screen.c
index 5b361e9bcc02557d8581968048e09dafd26bbee1..f85bd082543f0e0b3cdb183a8774a8f2d088be15 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -4315,7 +4315,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
            long prevcol = (long)(ptr - line) - (c == NUL);
 
            /* we're not really at that column when skipping some text */
-           if ((wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol)
+           if ((long)(wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol)
                ++prevcol;
 #endif
 

diff --git a/src/version.c b/src/version.c
index 156558ee41f299420dd8d24bf1575fbe3cf87dc6..fde9d207fdd2e845b72d746696dab2095b09e1bb 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 */
+/**/
+    154,
 /**/
     153,
 /**/