patch 8.2.3522: cannot use \x and \u when setting 'listchars'
Problem: Cannot use \x and \u when setting 'listchars'.
Solution: Support hex and unicode in hex form. (closes #9006)
diff --git a/src/charset.c b/src/charset.c
index fcaeedf..2c46f7a 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -2013,8 +2013,6 @@
return c - '0';
}
-#if defined(FEAT_TERMRESPONSE) || defined(FEAT_GUI_GTK) \
- || defined(PROTO) || defined(FEAT_AUTOSHELLDIR)
/*
* Convert two hex characters to a byte.
* Return -1 if one of the characters is not hex.
@@ -2026,7 +2024,6 @@
return -1;
return (hex2nr(p[0]) << 4) + hex2nr(p[1]);
}
-#endif
/*
* Return TRUE if "str" starts with a backslash that should be removed.
diff --git a/src/screen.c b/src/screen.c
index 8877586..78d7ef7 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4777,6 +4777,35 @@
#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.
* Returns error message, NULL if it's OK.
@@ -4884,19 +4913,19 @@
{
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 @@
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 @@
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;
}
diff --git a/src/testdir/test_listchars.vim b/src/testdir/test_listchars.vim
index 4cbd365..cb947aa 100644
--- a/src/testdir/test_listchars.vim
+++ b/src/testdir/test_listchars.vim
@@ -288,6 +288,10 @@
call cursor(1, 1)
call assert_equal(expected, ScreenLines(1, virtcol('$')))
+ set listchars=eol:\\u21d4,space:\\u2423,multispace:≡\\u2262\\U00002263,nbsp:\\U00002260,tab:←↔\\u2192
+ redraw!
+ call assert_equal(expected, ScreenLines(1, virtcol('$')))
+
set listchars+=lead:⇨,trail:⇦
let expected = ['⇨⇨⇨⇨⇨⇨⇨⇨a←↔↔↔↔↔→b␣c≠d⇦⇦⇔']
redraw!
diff --git a/src/version.c b/src/version.c
index 16e49ac..1b6e997 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3522,
+/**/
3521,
/**/
3520,