diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-10-06 18:52:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-06 18:52:38 -0700 |
| commit | 23ba875b821c454e81093de83f7fd6555a4dd0c4 (patch) | |
| tree | 3707321b4560e6d8b7d85d19a624ffdeaa374108 /src/nvim/eval.c | |
| parent | 8f20c50caa7fa008f5e6257ef0fc43620e3baeb1 (diff) | |
| parent | 97cdfdcde24c6a804f879b6464512008db4b5cef (diff) | |
| download | rneovim-23ba875b821c454e81093de83f7fd6555a4dd0c4.tar.gz rneovim-23ba875b821c454e81093de83f7fd6555a4dd0c4.tar.bz2 rneovim-23ba875b821c454e81093de83f7fd6555a4dd0c4.zip | |
Merge #11170 from janlazo/vim-8.1.2120
vim-patch:8.1.2120
Diffstat (limited to 'src/nvim/eval.c')
| -rw-r--r-- | src/nvim/eval.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index e3e5bb9a90..925b64d42c 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -15502,7 +15502,7 @@ static void f_setcharsearch(typval_T *argvars, typval_T *rettv, FunPtr fptr) } else set_last_csearch(PTR2CHAR(csearch), - csearch, MB_PTR2LEN(csearch)); + csearch, utfc_ptr2len(csearch)); } di = tv_dict_find(d, S_LEN("forward")); @@ -24051,8 +24051,8 @@ char_u *do_string_sub(char_u *str, char_u *pat, char_u *sub, /* Skip empty match except for first match. */ if (regmatch.startp[0] == regmatch.endp[0]) { if (zero_width == regmatch.startp[0]) { - /* avoid getting stuck on a match with an empty string */ - int i = MB_PTR2LEN(tail); + // avoid getting stuck on a match with an empty string + int i = utfc_ptr2len(tail); memmove((char_u *)ga.ga_data + ga.ga_len, tail, (size_t)i); ga.ga_len += i; tail += i; |