aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/eval.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2017-03-15 13:47:13 +0100
committerGitHub <noreply@github.com>2017-03-15 13:47:13 +0100
commit3b52e3c4c8784d60e44f3dc9a6bb7795af588931 (patch)
tree5df3024e99dd2a92042b054cfd39fa083d1a1fba /src/nvim/eval.c
parent227859ea79f981e67d5835cfed0be2123522ab2e (diff)
parentd72c177b2a743e147e0386f97b07030b49247390 (diff)
downloadrneovim-3b52e3c4c8784d60e44f3dc9a6bb7795af588931.tar.gz
rneovim-3b52e3c4c8784d60e44f3dc9a6bb7795af588931.tar.bz2
rneovim-3b52e3c4c8784d60e44f3dc9a6bb7795af588931.zip
Merge #6252 from jamessan/vim-7.4.2069
vim-patch:7.4.2069,7.4.2101,7.4.2222,7.4.2223
Diffstat (limited to 'src/nvim/eval.c')
-rw-r--r--src/nvim/eval.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 78f470b10a..7ca3d89665 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -16932,7 +16932,7 @@ static void f_strgetchar(typval_T *argvars, typval_T *rettv, FunPtr fptr)
break;
}
charidx--;
- byteidx += mb_cptr2len(str + byteidx);
+ byteidx += MB_CPTR2LEN(str + byteidx);
}
}
}
@@ -17054,7 +17054,7 @@ static void f_strcharpart(typval_T *argvars, typval_T *rettv, FunPtr fptr) {
if (!error) {
if (nchar > 0) {
while (nchar > 0 && nbyte < slen) {
- nbyte += mb_cptr2len(p + nbyte);
+ nbyte += MB_CPTR2LEN(p + nbyte);
nchar--;
}
} else {
@@ -17069,7 +17069,7 @@ static void f_strcharpart(typval_T *argvars, typval_T *rettv, FunPtr fptr) {
if (off < 0) {
len += 1;
} else {
- len += mb_cptr2len(p + off);
+ len += MB_CPTR2LEN(p + off);
}
charlen--;
}