From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 16 Mar 2012 18:24:26 +0000 (+0100)
Subject: updated for version 7.3.473
X-Git-Tag: v7.3.473
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ea69b7077fe26466210bd00bb20c35be84cca40;p=vim

updated for version 7.3.473
Problem:    'cursorbind' does not work correctly in combination with
            'virtualedit' set to "all".
Solution:   Copy coladd. (Gary Johnson)
---

diff --git a/src/move.c b/src/move.c
index ccbb4addc..fb033933c 100644
--- a/src/move.c
+++ b/src/move.c
@@ -2843,7 +2843,10 @@ halfpage(flag, Prenum)
 do_check_cursorbind()
 {
     linenr_T	line = curwin->w_cursor.lnum;
-    colnr_T	col =  curwin->w_cursor.col;
+    colnr_T	col = curwin->w_cursor.col;
+# ifdef FEAT_VIRTUALEDIT
+    colnr_T	coladd = curwin->w_cursor.coladd;
+# endif
     win_T	*old_curwin = curwin;
     buf_T	*old_curbuf = curbuf;
     int		restart_edit_save;
@@ -2875,6 +2878,9 @@ do_check_cursorbind()
 # endif
 		curwin->w_cursor.lnum = line;
 	    curwin->w_cursor.col = col;
+# ifdef FEAT_VIRTUALEDIT
+	    curwin->w_cursor.coladd = coladd;
+# endif
 
 	    /* Make sure the cursor is in a valid position.  Temporarily set
 	     * "restart_edit" to allow the cursor to be beyond the EOL. */
diff --git a/src/version.c b/src/version.c
index f52d9fa4a..3f36bbd8f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    473,
 /**/
     472,
 /**/