circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Do not expand single character format aliases inside #[] since they 

interfere with colours. GitHub issue 3239 from Magnus Gross.
pull/3247/head
nicm 2022-06-27 09:14:49 +00:00
parent 9c89f7c2af
commit 786cff8db9
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
format.c
View File

@ -4606,7 +4606,7 @@ format_expand1(struct format_expand_state *es, const char *fmt)
{ {
struct format_tree *ft = es->ft; struct format_tree *ft = es->ft;
char *buf, *out, *name; char *buf, *out, *name;
const char *ptr, *s; const char *ptr, *s, *style_end = NULL;
size_t off, len, n, outlen; size_t off, len, n, outlen;
int ch, brackets; int ch, brackets;
char expanded[8192]; char expanded[8192];
@ -4701,13 +4701,14 @@ format_expand1(struct format_expand_state *es, const char *fmt)
break; break;
fmt += n + 1; fmt += n + 1;
continue; continue;
case '[':
case '#': case '#':
/* /*
* If ##[ (with two or more #s), then it is a style and * If ##[ (with two or more #s), then it is a style and
* can be left for format_draw to handle. * can be left for format_draw to handle.
*/ */
ptr = fmt; ptr = fmt - (ch == '[');
n = 2; n = 2 - (ch == '[');
while (*ptr == '#') { while (*ptr == '#') {
ptr++; ptr++;
n++; n++;
@ -4721,6 +4722,7 @@ format_expand1(struct format_expand_state *es, const char *fmt)
memcpy(buf + off, fmt - 2, n + 1); memcpy(buf + off, fmt - 2, n + 1);
off += n + 1; off += n + 1;
fmt = ptr + 1; fmt = ptr + 1;
style_end = format_skip(fmt - 2, "]");
continue; continue;
} }
/* FALLTHROUGH */ /* FALLTHROUGH */
@ -4735,10 +4737,12 @@ format_expand1(struct format_expand_state *es, const char *fmt)
continue; continue;
default: default:
s = NULL; s = NULL;
if (fmt > style_end) { /* skip inside #[] */
if (ch >= 'A' && ch <= 'Z') if (ch >= 'A' && ch <= 'Z')
s = format_upper[ch - 'A']; s = format_upper[ch - 'A'];
else if (ch >= 'a' && ch <= 'z') else if (ch >= 'a' && ch <= 'z')
s = format_lower[ch - 'a']; s = format_lower[ch - 'a'];
}
if (s == NULL) { if (s == NULL) {
while (len - off < 3) { while (len - off < 3) {
buf = xreallocarray(buf, 2, len); buf = xreallocarray(buf, 2, len);