diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2021-12-19 09:55:17 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2021-12-19 09:55:17 +0800 |
| commit | 0e18cf4b6d2dccd303724c27ae90097cc033f233 (patch) | |
| tree | ac3dca97269c3a34d9eae53fb0be42dd0a56561d /src/nvim/option.c | |
| parent | c05e6476813a6079487c302fb6ed29ba655b0e8e (diff) | |
| download | rneovim-0e18cf4b6d2dccd303724c27ae90097cc033f233.tar.gz rneovim-0e18cf4b6d2dccd303724c27ae90097cc033f233.tar.bz2 rneovim-0e18cf4b6d2dccd303724c27ae90097cc033f233.zip | |
vim-patch:8.2.3846: no error when using control character for 'lcs' or 'fcs'
Problem: No error when using control character for 'lcs' or 'fcs'.
Solution: Use char2cells() to check the width. (closes vim/vim#9369)
https://github.com/vim/vim/commit/60618c8f1a7ea55452837a446525272142286471
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 2ceb1bd992..fba3de1fcc 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -3610,7 +3610,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) { @@ -3618,12 +3618,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; } } @@ -3657,7 +3657,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++; |