aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/eval.c6
-rw-r--r--src/nvim/eval.lua2
-rw-r--r--src/nvim/version.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index a9079c5519..4eb3b36464 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -15762,7 +15762,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_char2len(p[nbyte]);
+ nbyte += mb_cptr2len(p + nbyte);
nchar--;
}
} else {
@@ -15777,9 +15777,9 @@ static void f_strcharpart(typval_T *argvars, typval_T *rettv, FunPtr fptr) {
if (off < 0) {
len += 1;
} else {
- len += mb_char2len(p[off]);
- charlen--;
+ len += mb_cptr2len(p + off);
}
+ charlen--;
}
} else {
len = slen - nbyte; // default: all bytes that are available.
diff --git a/src/nvim/eval.lua b/src/nvim/eval.lua
index 633a4b1061..bea25b36f3 100644
--- a/src/nvim/eval.lua
+++ b/src/nvim/eval.lua
@@ -272,7 +272,7 @@ return {
strchars={args={1,2}},
strdisplaywidth={args={1, 2}},
strftime={args={1, 2}},
- strgetchar={args={2,2}},
+ strgetchar={args={2, 2}},
stridx={args={2, 3}},
string={args=1},
strlen={args=1},
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 53435e4650..153b7fb5fd 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -660,7 +660,7 @@ static int included_patches[] = {
// 1785,
// 1784 NA
// 1783,
- // 1782,
+ 1782,
// 1781,
// 1780,
1779,