diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2021-11-14 13:44:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-14 13:44:18 +0100 |
| commit | 27f8b04f1791c29825bbe4b10e4a8db9472ecaee (patch) | |
| tree | 1d8e2cd43baaca7f94ca08689b11231a128ec7cc /src/nvim/option.c | |
| parent | ee3a58d42e7fce666eef570db6f2944c29303d98 (diff) | |
| parent | 71a4d275dc3fa71c656c0d2423f60904822aa223 (diff) | |
| download | rneovim-27f8b04f1791c29825bbe4b10e4a8db9472ecaee.tar.gz rneovim-27f8b04f1791c29825bbe4b10e4a8db9472ecaee.tar.bz2 rneovim-27f8b04f1791c29825bbe4b10e4a8db9472ecaee.zip | |
Merge pull request #16315 from bfredl/multibytes
refactor(multibyte): eliminate mb_* aliases for utf_* functions
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 064a0f33ad..36a87d5a49 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -3529,7 +3529,7 @@ static char *set_chars_option(win_T *wp, char_u **varp, bool set) // TODO(bfredl): use schar_T representation and utfc_ptr2len int c1len = utf_ptr2len(s); c1 = mb_cptr2char_adv((const char_u **)&s); - if (mb_char2cells(c1) > 1 || (c1len == 1 && c1 > 127)) { + if (utf_char2cells(c1) > 1 || (c1len == 1 && c1 > 127)) { return e_invarg; } if (tab[i].cp == &wp->w_p_lcs_chars.tab2) { @@ -3538,13 +3538,13 @@ static char *set_chars_option(win_T *wp, char_u **varp, bool set) } int c2len = utf_ptr2len(s); c2 = mb_cptr2char_adv((const char_u **)&s); - if (mb_char2cells(c2) > 1 || (c2len == 1 && c2 > 127)) { + if (utf_char2cells(c2) > 1 || (c2len == 1 && c2 > 127)) { return e_invarg; } if (!(*s == ',' || *s == NUL)) { int c3len = utf_ptr2len(s); c3 = mb_cptr2char_adv((const char_u **)&s); - if (mb_char2cells(c3) > 1 || (c3len == 1 && c3 > 127)) { + if (utf_char2cells(c3) > 1 || (c3len == 1 && c3 > 127)) { return e_invarg; } } @@ -3579,7 +3579,7 @@ static char *set_chars_option(win_T *wp, char_u **varp, bool set) while (*s != NUL && *s != ',') { int c1len = utf_ptr2len(s); c1 = mb_cptr2char_adv((const char_u **)&s); - if (mb_char2cells(c1) > 1 || (c1len == 1 && c1 > 127)) { + if (utf_char2cells(c1) > 1 || (c1len == 1 && c1 > 127)) { return e_invarg; } multispace_len++; |