From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 8 Nov 2007 20:24:19 +0000 (+0000)
Subject: updated for version 7.1-154
X-Git-Tag: v7.1.154
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=33741a0f373ed3d504d89120d4fa0b03a40c84cb;p=vim

updated for version 7.1-154
---

diff --git a/src/screen.c b/src/screen.c
index 5b361e9bc..f85bd0825 100644
--- 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 156558ee4..fde9d207f 100644
--- 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,
 /**/