patch 7.4.1962

Problem:    Two test files for increment/decrement.
Solution:   Move the old style test into the new style test. (Hirohito
            Higashi, closes #881)

diff --git a/src/Makefile b/src/Makefile
index 4058f192003d4ab81296b2fa59e13cab3af690e4..3577cc2de9a97e542b635c3f882168391ffed164 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1996,7 +1996,7 @@ test1 \
        test2 test3 test4 test5 test6 test7 test8 test9 \
        test11 test12 test13 test14 test15 test16 test17 test18 test19 \
        test20 test21 test22 test23 test24 test25 test26 test27 test28 test29 \
-       test30 test31 test32 test33 test34 test35 test36 test37 test38 test39 \
+       test30 test31 test32 test33 test34 test36 test37 test38 test39 \
        test40 test41 test42 test43 test44 test45 test46 test47 test48 test49 \
        test50 test51 test52 test53 test54 test55 test56 test57 test58 test59 \
        test60 test61 test62 test63 test64 test65 test66 test67 test68 test69 \

diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index 5f8ce7d9de2848ba396d65d075ae0af4631f1a14..3d5385156a9ceb190b95a5ab7f0c1dbe66683d43 100644 (file)
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -32,7 +32,6 @@ SCRIPTS_ALL = \
        test31.out \
        test33.out \
        test34.out \
-       test35.out \
        test36.out \
        test37.out \
        test38.out \

diff --git a/src/testdir/main.aap b/src/testdir/main.aap
index 4e07f24a7ea003aa0b2eb2770eb35dcfe011708e..821aa2d94ac761ea1a71999466523802c5f43553 100644 (file)
--- a/src/testdir/main.aap
+++ b/src/testdir/main.aap
@@ -10,7 +10,7 @@ Scripts = test1.out test2.out test3.out test4.out test5.out test6.out
                test18.out test19.out test20.out test21.out test22.out
                test23.out test24.out test25.out test26.out test27.out
                test28.out test29.out test30.out test31.out test32.out
-               test33.out test34.out test35.out test36.out test37.out
+               test33.out test34.out test36.out test37.out
                test38.out test39.out test40.out test41.out test42.out
                test43.out test44.out test45.out test46.out test47.out
                test48.out test49.out test74.out

diff --git a/src/testdir/test35.in b/src/testdir/test35.in
deleted file mode 100644 (file)
index ba97911..0000000
--- a/src/testdir/test35.in
+++ /dev/null
@@ -1,21 +0,0 @@
-Test Ctrl-A and Ctrl-X, which increment and decrement decimal, hexadecimal,
-and octal numbers.
-
-STARTTEST
-/^start-here
-:set nrformats=octal,hex
-j\ 1102\18\ 1l\18l\ 164\ 1128\18$\18
-:set nrformats=octal
-0\ 1102\18\ 1l\182\ 1w65\ 1129\18blx6lD
-:set nrformats=hex
-0101\18l257\18\ 1Txldt \ 1 \18 \18
-:set nrformats=
-0200\18l100\18w78\18\ 1k
-:$-3,$wq! test.out
-ENDTEST
-
-start-here
-100     0x100     077     0
-100     0x100     077     
-100     0x100     077     0xfF     0xFf
-100     0x100     077     

diff --git a/src/testdir/test35.ok b/src/testdir/test35.ok
deleted file mode 100644 (file)
index 093ad95..0000000
--- a/src/testdir/test35.ok
+++ /dev/null
@@ -1,4 +0,0 @@
-0     0x0ff     0000     -1
-0     1x100     0777777
--1     0x0     078     0xFE     0xfe
--100     -100x100     000     

diff --git a/src/testdir/test_increment.vim b/src/testdir/test_increment.vim
index a6578cf0c7191db4278a929a3587501c038fa804..e53b5697169965184f0a755cfbca09f8f0a6283a 100644 (file)
--- a/src/testdir/test_increment.vim
+++ b/src/testdir/test_increment.vim
@@ -735,5 +735,26 @@ func Test_normal_increment_02()
   call assert_equal([0, 2, 4, 0], getpos('.'))
 endfunc
 
+" The test35 unified to this file.
+func Test_normal_increment_03()
+  call setline(1, ["100     0x100     077     0",
+        \          "100     0x100     077     ",
+        \          "100     0x100     077     0xfF     0xFf",
+        \          "100     0x100     077     "])
+  set nrformats=octal,hex
+  exec "norm! gg\<C-A>102\<C-X>\<C-A>l\<C-X>l\<C-A>64\<C-A>128\<C-X>$\<C-X>"
+  set nrformats=octal
+  exec "norm! j0\<C-A>102\<C-X>\<C-A>l\<C-X>2\<C-A>w65\<C-A>129\<C-X>blx6lD"
+  set nrformats=hex
+  exec "norm! j0101\<C-X>l257\<C-X>\<C-A>Txldt \<C-A> \<C-X> \<C-X>"
+  set nrformats=
+  exec "norm! j0200\<C-X>l100\<C-X>w78\<C-X>\<C-A>k"
+  call assert_equal(["0     0x0ff     0000     -1",
+        \            "0     1x100     0777777",
+        \            "-1     0x0     078     0xFE     0xfe",
+        \            "-100     -100x100     000     "], getline(1, '$'))
+  call assert_equal([0, 3, 25, 0], getpos('.'))
+endfunc
+
 
 " vim: tabstop=2 shiftwidth=2 expandtab

diff --git a/src/version.c b/src/version.c
index 0c744643ecc157d8eae564bea1e3a0df8129b949..286cbcb9e9b6f9276335dff2ec0799f1cbeac200 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1962,
 /**/
     1961,
 /**/