updated for version 7.1-249

diff --git a/src/undo.c b/src/undo.c
index 626529a15cb580d69f25617fe7ec83865531410d..852ed6b6f4a013ed88138098d958f85259abeced 100644 (file)
--- a/src/undo.c
+++ b/src/undo.c
@@ -1814,13 +1814,14 @@ u_undoline()
     if (undo_off)
        return;
 
-    if (curbuf->b_u_line_ptr == NULL ||
-                       curbuf->b_u_line_lnum > curbuf->b_ml.ml_line_count)
+    if (curbuf->b_u_line_ptr == NULL
+                       || curbuf->b_u_line_lnum > curbuf->b_ml.ml_line_count)
     {
        beep_flush();
        return;
     }
-       /* first save the line for the 'u' command */
+
+    /* first save the line for the 'u' command */
     if (u_savecommon(curbuf->b_u_line_lnum - 1,
                                curbuf->b_u_line_lnum + 1, (linenr_T)0) == FAIL)
        return;
@@ -1840,6 +1841,7 @@ u_undoline()
        curbuf->b_u_line_colnr = curwin->w_cursor.col;
     curwin->w_cursor.col = t;
     curwin->w_cursor.lnum = curbuf->b_u_line_lnum;
+    check_cursor_col();
 }
 
 /*

diff --git a/src/version.c b/src/version.c
index d6046666b25228b115f20a8e27d3827326b509ce..3d222f2a3aed1ca755d97a119d48c62c3a30dcee 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 */
+/**/
+    249,
 /**/
     248,
 /**/