updated for version 7.2-139

diff --git a/src/misc2.c b/src/misc2.c
index fafe931e67300968091e80927047b315f0b58003..cfc1bad8703d1357bde24dff4af96b19d072891c 100644 (file)
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -496,7 +496,8 @@ check_cursor_col()
 {
     colnr_T len;
 #ifdef FEAT_VIRTUALEDIT
-    colnr_T oldcol = curwin->w_cursor.col + curwin->w_cursor.coladd;
+    colnr_T oldcol = curwin->w_cursor.col;
+    colnr_T oldcoladd = curwin->w_cursor.col + curwin->w_cursor.coladd;
 #endif
 
     len = (colnr_T)STRLEN(ml_get_curline());
@@ -535,7 +536,13 @@ check_cursor_col()
     if (oldcol == MAXCOL)
        curwin->w_cursor.coladd = 0;
     else if (ve_flags == VE_ALL)
-       curwin->w_cursor.coladd = oldcol - curwin->w_cursor.col;
+    {
+       if (oldcoladd > curwin->w_cursor.col)
+           curwin->w_cursor.coladd = oldcoladd - curwin->w_cursor.col;
+       else
+           /* avoid weird number when there is a miscalculation or overflow */
+           curwin->w_cursor.coladd = 0;
+    }
 #endif
 }
 

diff --git a/src/version.c b/src/version.c
index 3b2548c0d2253dfa312df49406886e668c03089c..541fac6702242c27bf65932ee63538416c444611 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    139,
 /**/
     138,
 /**/