diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-10-16 17:51:40 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-10-16 17:51:40 +0100 |
| commit | 93ff6720fe4427341bc426b6d46e6324f226c270 (patch) | |
| tree | 59206daf1e304747723c5e4fcc8cabd16b3c310e /src/screen.c | |
| parent | abdcfd1c837e244065d4fe04c7a78abae5af3f7e (diff) | |
| download | vim-git-93ff6720fe4427341bc426b6d46e6324f226c270.tar.gz | |
patch 8.2.3522: cannot use \x and \u when setting 'listchars'v8.2.3522
Problem: Cannot use \x and \u when setting 'listchars'.
Solution: Support hex and unicode in hex form. (closes #9006)
Diffstat (limited to 'src/screen.c')
| -rw-r--r-- | src/screen.c | 39 |
1 files changed, 34 insertions, 5 deletions
diff --git a/src/screen.c b/src/screen.c index 88775862d..78d7ef7d7 100644 --- a/src/screen.c +++ b/src/screen.c @@ -4777,6 +4777,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. * Returns error message, NULL if it's OK. @@ -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; } |