Merge pull request #4563 from KillTheMule/vim-patch-1259

vim-patch: 7.4.1259

2 files changed, 27 insertions, 2 deletions

diff --git a/src/nvim/version.c b/src/nvim/version.c
index b55d31ea76..506bb1e3cf 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -423,7 +423,7 @@ static int included_patches[] = {
   // 1262 NA
   // 1261 NA
   // 1260 NA
-  // 1259,
+  1259,
   // 1258 NA
   // 1257 NA
   // 1256 NA
@@ -811,7 +811,7 @@ static int included_patches[] = {
   // 874 NA
   // 873 NA
   // 872 NA
-  // 871,
+  871,
   870,
   // 869 NA
   868,
diff --git a/test/functional/legacy/increment_spec.lua b/test/functional/legacy/increment_spec.lua
index 6139ec0b67..4aa24c0d53 100644
--- a/test/functional/legacy/increment_spec.lua
+++ b/test/functional/legacy/increment_spec.lua
@@ -708,6 +708,25 @@ describe('Ctrl-A/Ctrl-X on visual selections', function()
         call assert_equal(["20"], getline(1, '$'))
         call assert_equal([0, 1, 2, 0], getpos('.'))
       endfunc
+
+      " Test what patch 7.3.414 fixed. Ctrl-A on "000" drops the leading zeros.
+      func Test_normal_increment_01()
+          call setline(1, "000")
+        exec "norm! gg0\<C-A>"
+        call assert_equal("001", getline(1))
+
+        call setline(1, "000")
+        exec "norm! gg$\<C-A>"
+        call assert_equal("001", getline(1))
+
+        call setline(1, "001")
+        exec "norm! gg0\<C-A>"
+        call assert_equal("002", getline(1))
+
+        call setline(1, "001")
+        exec "norm! gg$\<C-A>"
+        call assert_equal("002", getline(1))
+      endfunc
     ]=])
   end)
 
@@ -720,4 +739,10 @@ describe('Ctrl-A/Ctrl-X on visual selections', function()
       eq({}, nvim.get_vvar('errors'))
     end)
   end
+
+  it('does not drop leading zeroes', function()
+    execute('set nrformats&vi') -- &vi makes Vim compatible
+    call('Test_normal_increment_01')
+    eq({}, nvim.get_vvar('errors'))
+  end)
 end)