Add a -l flag to display-message to disable format expansion, from Aaron

Jensen. GitHub issue 3372.
pull/3380/head
nicm 2022-11-03 08:33:57 +00:00
parent 9614f51560
commit 3be369522b
2 changed files with 14 additions and 5 deletions

View File

@ -39,8 +39,8 @@ const struct cmd_entry cmd_display_message_entry = {
.name = "display-message",
.alias = "display",
.args = { "ac:d:INpt:F:v", 0, 1, NULL },
.usage = "[-aINpv] [-c target-client] [-d delay] [-F format] "
.args = { "ac:d:lINpt:F:v", 0, 1, NULL },
.usage = "[-aIlNpv] [-c target-client] [-d delay] [-F format] "
CMD_TARGET_PANE_USAGE " [message]",
.target = { 't', CMD_FIND_PANE, CMD_FIND_CANFAIL },
@ -132,7 +132,11 @@ cmd_display_message_exec(struct cmd *self, struct cmdq_item *item)
return (CMD_RETURN_NORMAL);
}
msg = format_expand_time(ft, template);
if (args_has(args, 'l'))
msg = xstrdup(template);
else
msg = format_expand_time(ft, template);
if (cmdq_get_client(item) == NULL)
cmdq_error(item, "%s", msg);
else if (args_has(args, 'p'))

9
tmux.1
View File

@ -5887,7 +5887,7 @@ The following keys are also available:
.El
.Tg display
.It Xo Ic display-message
.Op Fl aINpv
.Op Fl aIlNpv
.Op Fl c Ar target-client
.Op Fl d Ar delay
.Op Fl t Ar target-pane
@ -5909,7 +5909,12 @@ is not given, the
option is used; a delay of zero waits for a key press.
.Ql N
ignores key presses and closes only after the delay expires.
The format of
If
.Fl l
is given,
.Ar message
is printed unchanged.
Otherwise, the format of
.Ar message
is described in the
.Sx FORMATS