From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 21 Mar 2016 22:13:32 +0000 (+0100)
Subject: patch 7.4.1634
X-Git-Tag: v7.4.1634
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8e08125d3a9afd0b16cd84454ae9ddad0abaaab0;p=vim

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 fa159e983..b1910d95d 100644
--- 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 275969e15..a6578cf0c 100644
--- 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 3f45bd64b..af13a75e5 100644
--- 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,
 /**/