updated for version 7.1-154

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
 

src/version.c

@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    154,
 /**/
     153,
 /**/