summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2008-02-13 14:21:38 +0000
committerBram Moolenaar <Bram@vim.org>2008-02-13 14:21:38 +0000
commite3300c8887bf78f056c44b6f0c55008182f4e2d4 (patch)
tree0e374624a2d72c7d1550780d1cd18eb52607b7df /src
parent0825043045f69784ed5a4db952988ca5ae7f6d48 (diff)
downloadvim-git-e3300c8887bf78f056c44b6f0c55008182f4e2d4.tar.gz
updated for version 7.1-249v7.1.249
Diffstat (limited to 'src')
-rw-r--r--src/undo.c8
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 3 deletions
diff --git a/src/undo.c b/src/undo.c
index 626529a15..852ed6b6f 100644
--- 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 d6046666b..3d222f2a3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 249,
+/**/
248,
/**/
247,