diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-12-25 19:08:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-25 19:08:36 -0500 |
| commit | 397201f2c6ae89aeaea2a259b1c095303e7ee4d0 (patch) | |
| tree | c28abe78299a7c7e47bd249f1bf4419c7c116651 /src/nvim/option.c | |
| parent | 06985fa595b5cd43e1a1b3a1b66198d4d0ae1c2f (diff) | |
| parent | 0e18cf4b6d2dccd303724c27ae90097cc033f233 (diff) | |
| download | rneovim-397201f2c6ae89aeaea2a259b1c095303e7ee4d0.tar.gz rneovim-397201f2c6ae89aeaea2a259b1c095303e7ee4d0.tar.bz2 rneovim-397201f2c6ae89aeaea2a259b1c095303e7ee4d0.zip | |
Merge pull request #16705 from zeertzjq/vim-8.2.2508
vim-patch:8.2.{2508,2641,3846}
Diffstat (limited to 'src/nvim/option.c')
| -rw-r--r-- | src/nvim/option.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 02e7aeb98b..65adda3c01 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -3613,7 +3613,7 @@ static char *set_chars_option(win_T *wp, char_u **varp, bool set) c2 = c3 = 0; s = p + len + 1; c1 = get_encoded_char_adv(&s); - if (c1 == 0 || utf_char2cells(c1) > 1) { + if (c1 == 0 || char2cells(c1) > 1) { return e_invarg; } if (tab[i].cp == &wp->w_p_lcs_chars.tab2) { @@ -3621,12 +3621,12 @@ static char *set_chars_option(win_T *wp, char_u **varp, bool set) return e_invarg; } c2 = get_encoded_char_adv(&s); - if (c2 == 0 || utf_char2cells(c2) > 1) { + if (c2 == 0 || char2cells(c2) > 1) { return e_invarg; } if (!(*s == ',' || *s == NUL)) { c3 = get_encoded_char_adv(&s); - if (c3 == 0 || utf_char2cells(c3) > 1) { + if (c3 == 0 || char2cells(c3) > 1) { return e_invarg; } } @@ -3660,7 +3660,7 @@ static char *set_chars_option(win_T *wp, char_u **varp, bool set) multispace_len = 0; while (*s != NUL && *s != ',') { c1 = get_encoded_char_adv(&s); - if (c1 == 0 || utf_char2cells(c1) > 1) { + if (c1 == 0 || char2cells(c1) > 1) { return e_invarg; } multispace_len++; |