commit 33741a0f373ed3d504d89120d4fa0b03a40c84cb
author Bram Moolenaar <Bram@vim.org> Thu Nov 08 20:24:19 2007 +0000
committer Bram Moolenaar <Bram@vim.org> Thu Nov 08 20:24:19 2007 +0000
tree 2d992b2cc671a805d59721451880b669ac6861cd
parent 6f1924547b30753738ea0eb41ab31513894fde83

updated for version 7.1-154

src/screen.c

diff --git a/src/screen.c b/src/screen.c
index 5b361e9..f85bd08 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4315,7 +4315,7 @@
 	    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

diff --git a/src/version.c b/src/version.c
index 156558e..fde9d20 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    154,
+/**/
     153,
 /**/
     152,