updated for version 7.3.482

Problem:    With 'cursorbind' set moving up/down does not always keep the same
            column.
Solution:   Set curswant appropriately. (Gary Johnson)

diff --git a/src/move.c b/src/move.c
index fb033933cae8daf7c8e6415243bcff52814465fc..21a74b8adceedea0d533de886e593581a07da2bf 100644 (file)
--- a/src/move.c
+++ b/src/move.c
@@ -2847,6 +2847,8 @@ do_check_cursorbind()
 # ifdef FEAT_VIRTUALEDIT
     colnr_T    coladd = curwin->w_cursor.coladd;
 # endif
+    colnr_T    curswant = curwin->w_curswant;
+    int                set_curswant = curwin->w_set_curswant;
     win_T      *old_curwin = curwin;
     buf_T      *old_curbuf = curbuf;
     int                restart_edit_save;
@@ -2881,6 +2883,8 @@ do_check_cursorbind()
 # ifdef FEAT_VIRTUALEDIT
            curwin->w_cursor.coladd = coladd;
 # endif
+           curwin->w_curswant = curswant;
+           curwin->w_set_curswant = set_curswant;
 
            /* 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 a1bd77c9336f5686ae95e081942c598679fc664f..b9df08512c83073b528e88af0029f0df828c6d6d 100644 (file)
--- 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 */
+/**/
+    482,
 /**/
     481,
 /**/