circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master' into master

pull/2875/head
Thomas Adam 2021-09-10 12:01:10 +01:00
parent 31a6e5eff4 5cdc1bdd32
commit 3358c9a8f1
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd-parse.y
View File

@ -749,6 +749,8 @@ cmd_parse_expand_alias(struct cmd_parse_command *cmd,
struct cmd_parse_command *last;
char *alias, *name, *cause;
if (pi->flags & CMD_PARSE_NOALIAS)
return (0);
memset(pr, 0, sizeof *pr);
first = TAILQ_FIRST(&cmd->arguments);
@ -788,7 +790,9 @@ cmd_parse_expand_alias(struct cmd_parse_command *cmd,
}
cmd_parse_log_commands(cmds, __func__);
pi->flags |= CMD_PARSE_NOALIAS;
cmd_parse_build_commands(cmds, pi, pr);
pi->flags &= ~CMD_PARSE_NOALIAS;
return (1);
}