diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2021-11-14 12:34:43 +0100 |
|---|---|---|
| committer | Björn Linse <bjorn.linse@gmail.com> | 2021-11-14 12:49:09 +0100 |
| commit | 9f27e6cbe70643e7b26e0b4f024fad3f75b1950c (patch) | |
| tree | f421c46713703228398050f65f610cff8f72c429 /src/nvim/option.c | |
| parent | 2ef9d2a663db35c73b93606dbe882ca697072cc3 (diff) | |
| download | rneovim-9f27e6cbe70643e7b26e0b4f024fad3f75b1950c.tar.gz rneovim-9f27e6cbe70643e7b26e0b4f024fad3f75b1950c.tar.bz2 rneovim-9f27e6cbe70643e7b26e0b4f024fad3f75b1950c.zip | |
refactor(multibyte): eliminate mb_char2cells alias for utf_char2cells
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++; |