Add -F for command-prompt and use it to fix "Rename" on the window menu, GitHub

issue 2699.
This commit is contained in:
Nicholas Marriott
2021-05-10 07:52:30 +01:00
parent bde3829131
commit 4ca6b42c24
3 changed files with 13 additions and 6 deletions

View File

@ -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");