diff options
| -rw-r--r-- | cmd-command-prompt.c | 10 | ||||
| -rw-r--r-- | key-bindings.c | 2 | ||||
| -rw-r--r-- | tmux.1 | 7 |
3 files changed, 13 insertions, 6 deletions
diff --git a/cmd-command-prompt.c b/cmd-command-prompt.c index c2a2dec7..a955ac32 100644 --- a/cmd-command-prompt.c +++ b/cmd-command-prompt.c @@ -40,8 +40,8 @@ const struct cmd_entry cmd_command_prompt_entry = { .name = "command-prompt", .alias = NULL, - .args = { "1kiI:Np:t:T:", 0, 1 }, - .usage = "[-1kiN] [-I inputs] [-p prompts] " CMD_TARGET_CLIENT_USAGE + .args = { "1FkiI:Np:t:T:", 0, 1 }, + .usage = "[-1FkiN] [-I inputs] [-p prompts] " CMD_TARGET_CLIENT_USAGE " [-T type] [template]", .flags = CMD_CLIENT_TFLAG, @@ -59,7 +59,7 @@ struct cmd_command_prompt_cdata { char *next_prompt; char *template; - int idx; + int idx; }; static enum cmd_retval @@ -87,7 +87,9 @@ cmd_command_prompt_exec(struct cmd *self, struct cmdq_item *item) cdata->template = NULL; cdata->idx = 1; - if (args->argc != 0) + if (args->argc != 0 && args_has(args, 'F')) + cdata->template = format_single_from_target(item, args->argv[0]); + else if (args->argc != 0) cdata->template = xstrdup(args->argv[0]); else cdata->template = xstrdup("%1"); diff --git a/key-bindings.c b/key-bindings.c index b380f2cd..de5c20ee 100644 --- a/key-bindings.c +++ b/key-bindings.c @@ -41,7 +41,7 @@ " 'Kill' 'X' {kill-window}" \ " 'Respawn' 'R' {respawn-window -k}" \ " '#{?pane_marked,Unmark,Mark}' 'm' {select-pane -m}" \ - " 'Rename' 'n' {command-prompt -I \"#W\" \"rename-window -- '%%'\"}" \ + " 'Rename' 'n' {command-prompt -FI \"#W\" \"rename-window -t#{window_id} -- '%%'\"}" \ " ''" \ " 'New After' 'w' {new-window -a}" \ " 'New At End' 'W' {new-window}" @@ -5392,7 +5392,7 @@ See for possible values for .Ar prompt-type . .It Xo Ic command-prompt -.Op Fl 1ikN +.Op Fl 1FikN .Op Fl I Ar inputs .Op Fl p Ar prompts .Op Fl t Ar target-client @@ -5407,6 +5407,11 @@ to execute commands interactively. If .Ar template is specified, it is used as the command. +With +.Fl F , +.Ar template +is expanded as a format. +.Pp If present, .Fl I is a comma-separated list of the initial text for each prompt. |