patch 7.4.1954

Problem:    No test for what 7.4.1948 fixes.
Solution:   Add a test. (Hirohito Higashi, closes #880)

diff --git a/src/Makefile b/src/Makefile
index 76b16b667cf53da9f0e4862f281a32516ff143c1..5c4e44f0d17787c6b13f52597286b8c3e2e03bba 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2031,6 +2031,7 @@ test_arglist \
        test_help_tagjump \
        test_history \
        test_increment \
+       test_increment_dbcs \
        test_join \
        test_json \
        test_langmap \

diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index a22a76f058628714e8aed39d62a79f3e9d1ff23e..5f8ce7d9de2848ba396d65d075ae0af4631f1a14 100644 (file)
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -172,6 +172,7 @@ NEW_TESTS = test_arglist.res \
            test_hardcopy.res \
            test_history.res \
            test_increment.res \
+           test_increment_dbcs.res \
            test_json.res \
            test_langmap.res \
            test_man.res \

diff --git a/src/testdir/test_increment_dbcs.vim b/src/testdir/test_increment_dbcs.vim
new file mode 100644 (file)
index 0000000..e1b6632
--- /dev/null
+++ b/src/testdir/test_increment_dbcs.vim
@@ -0,0 +1,30 @@
+" Tests for using Ctrl-A/Ctrl-X using DBCS.
+if !has('multi_byte')
+  finish
+endif
+set encoding=cp932
+scriptencoding cp932
+
+func SetUp()
+  new
+  set nrformats&
+endfunc
+
+func TearDown()
+  bwipe!
+endfunc
+
+func Test_increment_dbcs_1()
+  set nrformats+=alpha
+  call setline(1, ["\8eR1"])
+  exec "norm! 0\<C-A>"
+  call assert_equal(["\8eR2"], getline(1, '$'))
+  call assert_equal([0, 1, 3, 0], getpos('.'))
+
+  call setline(1, ["\82`\82a\82b0xDE\82e"])
+  exec "norm! 0\<C-X>"
+  call assert_equal(["\82`\82a\82b0xDD\82e"], getline(1, '$'))
+  call assert_equal([0, 1, 10, 0], getpos('.'))
+endfunc
+
+" vim: shiftwidth=2 expandtab

diff --git a/src/version.c b/src/version.c
index c0e170c51948c39b30b08b875362dd7ea3e65e6b..78f8629915c7ca1dd72d08971cb189c061d8933a 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 */
+/**/
+    1954,
 /**/
     1953,
 /**/