diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-04-23 15:30:09 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-04-23 15:30:09 +0200 |
| commit | fca66003053f8c0da5161d1fe4b75b3a389934b5 (patch) | |
| tree | 0dd81e7f7f6b1873b50e2e9efeda14c814e1467d | |
| parent | da5b3dcf06a3af5b398450258be32b0416451a9b (diff) | |
| download | vim-git-fca66003053f8c0da5161d1fe4b75b3a389934b5.tar.gz | |
patch 7.4.1782v7.4.1782
Problem: strcharpart() does not work properly with some multi-byte
characters.
Solution: Use mb_cptr2len() instead of mb_char2len(). (Hirohito Higashi)
| -rw-r--r-- | src/eval.c | 4 | ||||
| -rw-r--r-- | src/testdir/test_expr_utf8.vim | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/src/eval.c b/src/eval.c index b3ebbd727..63ff2a029 100644 --- 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 c512ddf43..e8246ef38 100644 --- 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 2ae156cda..09372ef5d 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 */ /**/ + 1782, +/**/ 1781, /**/ 1780, |