patch 7.4.1634

Problem:    Vertical movement after CTRL-A ends up in the wrong column.
            (Urtica Dioica)
Solution:   Set curswant when appropriate. (Hirohito Higashi)

diff --git a/src/ops.c b/src/ops.c
index fa159e983ccb6b9c37bf55fa3efcc0ed77738bee..b1910d95d06395ef79163927605937bd4147c86d 100644 (file)
--- a/src/ops.c
+++ b/src/ops.c
@@ -5783,6 +5783,8 @@ do_addsub(
 theend:
     if (visual)
        curwin->w_cursor = save_cursor;
+    else if (did_change)
+       curwin->w_set_curswant = TRUE;
 
     return did_change;
 }

diff --git a/src/testdir/test_increment.vim b/src/testdir/test_increment.vim
index 275969e15f58f5f3c97ae45450d66425c6d7cc07..a6578cf0c7191db4278a929a3587501c038fa804 100644 (file)
--- a/src/testdir/test_increment.vim
+++ b/src/testdir/test_increment.vim
@@ -727,4 +727,13 @@ func Test_normal_increment_01()
   call assert_equal("002", getline(1))
 endfunc
 
+" Test a regression of patch 7.4.1087 fixed.
+func Test_normal_increment_02()
+  call setline(1, ["hello 10", "world"])
+  exec "norm! ggl\<C-A>jx"
+  call assert_equal(["hello 11", "worl"], getline(1, '$'))
+  call assert_equal([0, 2, 4, 0], getpos('.'))
+endfunc
+
+
 " vim: tabstop=2 shiftwidth=2 expandtab

diff --git a/src/version.c b/src/version.c
index 3f45bd64b5b986a0f09ff9745e5c5279a16a76e8..af13a75e52665b7c764a694b10cc9cee9c3d4bbc 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1634,
 /**/
     1633,
 /**/