mirror of
https://github.com/tmux/tmux.git
synced 2025-04-26 23:18:50 +00:00
Add a -l flag to display-message to disable format expansion, from Aaron
Jensen. GitHub issue 3372.
This commit is contained in:
parent
9614f51560
commit
3be369522b
@ -39,8 +39,8 @@ const struct cmd_entry cmd_display_message_entry = {
|
|||||||
.name = "display-message",
|
.name = "display-message",
|
||||||
.alias = "display",
|
.alias = "display",
|
||||||
|
|
||||||
.args = { "ac:d:INpt:F:v", 0, 1, NULL },
|
.args = { "ac:d:lINpt:F:v", 0, 1, NULL },
|
||||||
.usage = "[-aINpv] [-c target-client] [-d delay] [-F format] "
|
.usage = "[-aIlNpv] [-c target-client] [-d delay] [-F format] "
|
||||||
CMD_TARGET_PANE_USAGE " [message]",
|
CMD_TARGET_PANE_USAGE " [message]",
|
||||||
|
|
||||||
.target = { 't', CMD_FIND_PANE, CMD_FIND_CANFAIL },
|
.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);
|
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)
|
if (cmdq_get_client(item) == NULL)
|
||||||
cmdq_error(item, "%s", msg);
|
cmdq_error(item, "%s", msg);
|
||||||
else if (args_has(args, 'p'))
|
else if (args_has(args, 'p'))
|
||||||
|
9
tmux.1
9
tmux.1
@ -5887,7 +5887,7 @@ The following keys are also available:
|
|||||||
.El
|
.El
|
||||||
.Tg display
|
.Tg display
|
||||||
.It Xo Ic display-message
|
.It Xo Ic display-message
|
||||||
.Op Fl aINpv
|
.Op Fl aIlNpv
|
||||||
.Op Fl c Ar target-client
|
.Op Fl c Ar target-client
|
||||||
.Op Fl d Ar delay
|
.Op Fl d Ar delay
|
||||||
.Op Fl t Ar target-pane
|
.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.
|
option is used; a delay of zero waits for a key press.
|
||||||
.Ql N
|
.Ql N
|
||||||
ignores key presses and closes only after the delay expires.
|
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
|
.Ar message
|
||||||
is described in the
|
is described in the
|
||||||
.Sx FORMATS
|
.Sx FORMATS
|
||||||
|
Loading…
Reference in New Issue
Block a user