summaryrefslogtreecommitdiff
path: root/src/eval.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-04-23 15:30:09 +0200
committerBram Moolenaar <Bram@vim.org>2016-04-23 15:30:09 +0200
commitfca66003053f8c0da5161d1fe4b75b3a389934b5 (patch)
tree0dd81e7f7f6b1873b50e2e9efeda14c814e1467d /src/eval.c
parentda5b3dcf06a3af5b398450258be32b0416451a9b (diff)
downloadvim-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)
Diffstat (limited to 'src/eval.c')
-rw-r--r--src/eval.c4
1 files changed, 2 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;
}
}