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 #9369)
diff --git a/src/screen.c b/src/screen.c
index aee18d8..695318b 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4914,19 +4914,19 @@
c2 = c3 = 0;
s = p + len + 1;
c1 = get_encoded_char_adv(&s);
- if (mb_char2cells(c1) > 1)
+ if (char2cells(c1) > 1)
return e_invarg;
if (tab[i].cp == &lcs_chars.tab2)
{
if (*s == NUL)
return e_invarg;
c2 = get_encoded_char_adv(&s);
- if (mb_char2cells(c2) > 1)
+ if (char2cells(c2) > 1)
return e_invarg;
if (!(*s == ',' || *s == NUL))
{
c3 = get_encoded_char_adv(&s);
- if (mb_char2cells(c3) > 1)
+ if (char2cells(c3) > 1)
return e_invarg;
}
}
@@ -4968,7 +4968,7 @@
while (*s != NUL && *s != ',')
{
c1 = get_encoded_char_adv(&s);
- if (mb_char2cells(c1) > 1)
+ if (char2cells(c1) > 1)
return e_invarg;
++multispace_len;
}