patch 7.4.1954v7.4.1954

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

4 files changed, 34 insertions, 0 deletions

diff --git a/src/Makefile b/src/Makefile
index 76b16b667..5c4e44f0d 100644
--- 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 a22a76f05..5f8ce7d9d 100644
--- 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
index 000000000..e1b663293
--- /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, ["ŽR1"])
+  exec "norm! 0\<C-A>"
+  call assert_equal(["ŽR2"], getline(1, '$'))
+  call assert_equal([0, 1, 3, 0], getpos('.'))
+
+  call setline(1, ["‚`‚a‚b0xDE‚e"])
+  exec "norm! 0\<C-X>"
+  call assert_equal(["‚`‚a‚b0xDD‚e"], 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 c0e170c51..78f862991 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1954,
+/**/
     1953,
 /**/
     1952,