patch 7.4.1782

Problem:    strcharpart() does not work properly with some multi-byte
            characters.
Solution:   Use mb_cptr2len() instead of mb_char2len(). (Hirohito Higashi)

diff --git a/src/eval.c b/src/eval.c
index b3ebbd7276415abea17766709a77eb64d01b2640..63ff2a0292900a99a7569c3afa6a329442bc34a5 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -19764,7 +19764,7 @@ f_strcharpart(typval_T *argvars, typval_T *rettv)
        if (nchar > 0)
            while (nchar > 0 && nbyte < slen)
            {
-               nbyte += mb_char2len(p[nbyte]);
+               nbyte += mb_cptr2len(p + nbyte);
                --nchar;
            }
        else
@@ -19779,7 +19779,7 @@ f_strcharpart(typval_T *argvars, typval_T *rettv)
                if (off < 0)
                    len += 1;
                else
-                   len += mb_char2len(p[off]);
+                   len += mb_cptr2len(p + off);
                --charlen;
            }
        }

diff --git a/src/testdir/test_expr_utf8.vim b/src/testdir/test_expr_utf8.vim
index c512ddf430e184dd3e715181be21426c7f5d7bb0..e8246ef383b190f5a267527e6231afa4ce9986b2 100644 (file)
--- a/src/testdir/test_expr_utf8.vim
+++ b/src/testdir/test_expr_utf8.vim
@@ -23,6 +23,16 @@ func Test_strcharpart()
   call assert_equal('á', strcharpart('áxb', 0, 1))
   call assert_equal('x', strcharpart('áxb', 1, 1))
 
+  call assert_equal('いうeお', strcharpart('あいうeお', 1))
+  call assert_equal('い', strcharpart('あいうeお', 1, 1))
+  call assert_equal('いう', strcharpart('あいうeお', 1, 2))
+  call assert_equal('いうe', strcharpart('あいうeお', 1, 3))
+  call assert_equal('いうeお', strcharpart('あいうeお', 1, 4))
+  call assert_equal('eお', strcharpart('あいうeお', 3))
+  call assert_equal('e', strcharpart('あいうeお', 3, 1))
+
+  call assert_equal('あ', strcharpart('あいうeお', -3, 4))
+
   call assert_equal('a', strcharpart('àxb', 0, 1))
   call assert_equal('̀', strcharpart('àxb', 1, 1))
   call assert_equal('x', strcharpart('àxb', 2, 1))

diff --git a/src/version.c b/src/version.c
index 2ae156cda469123c00c1832a99ca0e81c41878c5..09372ef5da4ad83372b909c10c28d86c142761b3 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 */
+/**/
+    1782,
 /**/
     1781,
 /**/