From ed6c2a64b43dcce145fe474a580a2d7848dce296 Mon Sep 17 00:00:00 2001
From: edyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Date: Wed, 13 Feb 2008 14:55:56 +0000
Subject: [PATCH] Merged from the latest developing branch.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@882 2a77ed30-b011-0410-a7ad-c7884a0aa172
---
 src/undo.c    | 8 +++++---
 src/version.c | 2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/undo.c b/src/undo.c
index 626529a1..852ed6b6 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 d6046666..3d222f2a 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,
-- 
2.11.4.GIT