mirror of
https://github.com/tmux/tmux.git
synced 2026-06-04 09:20:26 +00:00
Change run-shell expansion to just be #{1} etc not #1 which interferes
with colours.
This commit is contained in:
9
format.c
9
format.c
@@ -5598,7 +5598,7 @@ format_expand1(struct format_expand_state *es, const char *fmt)
|
|||||||
const char *ptr, *s, *style_end = NULL;
|
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], number[2] = { 0 };
|
char expanded[8192];
|
||||||
|
|
||||||
if (fmt == NULL || *fmt == '\0' || !format_check_time(es))
|
if (fmt == NULL || *fmt == '\0' || !format_check_time(es))
|
||||||
return (xstrdup(""));
|
return (xstrdup(""));
|
||||||
@@ -5727,13 +5727,6 @@ format_expand1(struct format_expand_state *es, const char *fmt)
|
|||||||
continue;
|
continue;
|
||||||
default:
|
default:
|
||||||
s = NULL;
|
s = NULL;
|
||||||
if (ch >= '1' && ch <= '9') {
|
|
||||||
number[0] = ch;
|
|
||||||
if (format_replace(es, number, 1, &buf, &len,
|
|
||||||
&off) != 0)
|
|
||||||
break;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (fmt > style_end) { /* skip inside #[] */
|
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'];
|
||||||
|
|||||||
Reference in New Issue
Block a user