1 files changed, 17 insertions, 4 deletions
diff --git a/test/functional/legacy/increment_spec.lua b/test/functional/legacy/increment_spec.lua
index 0483edc934..d51f9a2e02 100644
--- a/test/functional/legacy/increment_spec.lua
+++ b/test/functional/legacy/increment_spec.lua
@@ -1,7 +1,7 @@
 -- Tests for using Ctrl-A/Ctrl-X on visual selections
 
 local helpers = require('test.functional.helpers')(after_each)
-local source, execute = helpers.source, helpers.execute
+local source, command = helpers.source, helpers.command
 local call, clear = helpers.call, helpers.clear
 local eq, nvim = helpers.eq, helpers.meths
 
@@ -685,7 +685,7 @@ describe('Ctrl-A/Ctrl-X on visual selections', function()
       " Text:
       "   1 23
       "   4 56
-      " 
+      "
       " Expected:
       "   1) f2 Ctrl-V jl <ctrl-a>, repeat twice afterwards with .
       "   1 26
@@ -727,6 +727,14 @@ describe('Ctrl-A/Ctrl-X on visual selections', function()
         exec "norm! gg$\<C-A>"
         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
     ]=])
   end)
 
@@ -734,15 +742,20 @@ describe('Ctrl-A/Ctrl-X on visual selections', function()
     local id = string.format('%02d', i)
 
     it('works on Test ' .. id, function()
-      execute('set nrformats&vi') -- &vi makes Vim compatible
+      command('set nrformats&vi') -- &vi makes Vim compatible
       call('Test_visual_increment_' .. id)
       eq({}, nvim.get_vvar('errors'))
     end)
   end
 
   it('does not drop leading zeroes', function()
-    execute('set nrformats&vi') -- &vi makes Vim compatible
+    command('set nrformats&vi') -- &vi makes Vim compatible
     call('Test_normal_increment_01')
     eq({}, nvim.get_vvar('errors'))
   end)
+
+  it('maintains correct column after CTRL-A', function()
+    call('Test_normal_increment_02')
+    eq({}, nvim.get_vvar('errors'))
+  end)
 end)