thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.3522: cannot use \x and \u when setting 'listchars'

Browse Source 
Problem:    Cannot use \x and \u when setting 'listchars'.
Solution:   Support hex and unicode in hex form. (closes #9006)
This commit is contained in:
Bram Moolenaar
2021-10-16 17:51:40 +01:00
parent abdcfd1c83
commit 93ff6720fe
5 changed files with 47 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/screen.c
View File

@@ -4776,6 +4776,35 @@ screen_screenrow(void)
}
#endif
/*
* Calls mb_ptr2char_adv(p) and returns the character.
* If "p" starts with "\x", "\u" or "\U" the hex or unicode value is used.
*/
static int
get_encoded_char_adv(char_u **p)
{
char_u *s = *p;
if (s[0] == '\\' && (s[1] == 'x' || s[1] == 'u' || s[1] == 'U'))
{
varnumber_T num = 0;
int bytes;
int n;
for (bytes = s[1] == 'x' ? 1 : s[1] == 'u' ? 2 : 4; bytes > 0; --bytes)
{
*p += 2;
n = hexhex2nr(*p);
if (n < 0)
return 0;
num = num * 256 + n;
}
*p += 2;
return num;
}
return mb_ptr2char_adv(p);
}
/*
* Handle setting 'listchars' or 'fillchars'.
* Assume monocell characters.
@@ -4884,19 +4913,19 @@ set_chars_option(win_T *wp, char_u **varp)
{
c2 = c3 = 0;
s = p + len + 1;
c1 = mb_ptr2char_adv(&s);
c1 = get_encoded_char_adv(&s);
if (mb_char2cells(c1) > 1)
return e_invarg;
if (tab[i].cp == &lcs_chars.tab2)
{
if (*s == NUL)
return e_invarg;
c2 = mb_ptr2char_adv(&s);
c2 = get_encoded_char_adv(&s);
if (mb_char2cells(c2) > 1)
return e_invarg;
if (!(*s == ',' || *s == NUL))
{
c3 = mb_ptr2char_adv(&s);
c3 = get_encoded_char_adv(&s);
if (mb_char2cells(c3) > 1)
return e_invarg;
}
@@ -4938,7 +4967,7 @@ set_chars_option(win_T *wp, char_u **varp)
multispace_len = 0;
while (*s != NUL && *s != ',')
{
c1 = mb_ptr2char_adv(&s);
c1 = get_encoded_char_adv(&s);
if (mb_char2cells(c1) > 1)
return e_invarg;
++multispace_len;
@@ -4954,7 +4983,7 @@ set_chars_option(win_T *wp, char_u **varp)
while (*s != NUL && *s != ',')
{
c1 = mb_ptr2char_adv(&s);
c1 = get_encoded_char_adv(&s);
if (p == last_multispace)
lcs_chars.multispace[multispace_pos++] = c1;
}