diff options
| author | nicm <nicm> | 2022-11-03 08:33:57 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2022-11-03 08:33:57 +0000 |
| commit | 3be369522b6de38ba08ee50a86a49a9a86af490b (patch) | |
| tree | 50de0761a52ec8c3e1c6973ad38f04024d0e994c | |
| parent | 9614f5156079773b338a13e95ec932cc7c95b031 (diff) | |
Add a -l flag to display-message to disable format expansion, from Aaron
Jensen. GitHub issue 3372.
| -rw-r--r-- | cmd-display-message.c | 10 | ||||
| -rw-r--r-- | tmux.1 | 9 |
2 files changed, 14 insertions, 5 deletions
diff --git a/cmd-display-message.c b/cmd-display-message.c index 7828f694..f5e91020 100644 --- a/cmd-display-message.c +++ b/cmd-display-message.c @@ -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')) @@ -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 |