aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.2.3297: cannot use all commands inside a {} block

Browse Source 
Problem:    Cannot use all commands inside a {} block after :command and
            :autocmd.
Solution:   Do consider \n to separate commands. (closes #8620)
This commit is contained in:
Bram Moolenaar
2021-08-05 20:40:03 +02:00
parent af647e76ca
commit 63b9173693
16 changed files with 90 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/ex_docmd.c
View File

@@ -2314,22 +2314,24 @@ do_one_cmd(
ea.do_ecmd_cmd = getargcmd(&ea.arg);
/*
* Check for '|' to separate commands and '"' or '#' to start comments.
* Don't do this for ":read !cmd" and ":write !cmd".
*/
if ((ea.argt & EX_TRLBAR) && !ea.usefilter)
separate_nextcmd(&ea);
/*
* Check for <newline> to end a shell command.
* For commands that do not use '|' inside their argument: Check for '|' to
* separate commands and '"' or '#' to start comments.
*
* Otherwise: Check for <newline> to end a shell command.
* Also do this for ":read !cmd", ":write !cmd" and ":global".
* Also do this inside a { - } block after :command and :autocmd.
* Any others?
*/
if ((ea.argt & EX_TRLBAR) && !ea.usefilter)
{
separate_nextcmd(&ea);
}
else if (ea.cmdidx == CMD_bang
|| ea.cmdidx == CMD_terminal
|| ea.cmdidx == CMD_global
|| ea.cmdidx == CMD_vglobal
|| ea.usefilter)
|| ea.usefilter
|| inside_block(&ea))
{
for (p = ea.arg; *p; ++p)
{
@@ -5409,6 +5411,21 @@ check_nextcmd(char_u *p)
return NULL;
}
/*
* If "eap->nextcmd" is not set, check for a next command at "p".
*/
void
set_nextcmd(exarg_T *eap, char_u *arg)
{
char_u *p = check_nextcmd(arg);
if (eap->nextcmd == NULL)
eap->nextcmd = p;
else if (p != NULL)
// cannot use "| command" inside a {} block
semsg(_(e_cannot_use_bar_to_separate_commands_here_str), arg);
}
/*
* - if there are more files to edit
* - and this is the last window
@@ -7546,7 +7563,7 @@ ex_wincmd(exarg_T *eap)
else
p = eap->arg + 1;
eap->nextcmd = check_nextcmd(p);
set_nextcmd(eap, p);
p = skipwhite(p);
if (*p != NUL && *p != (
#ifdef FEAT_EVAL
@@ -8580,7 +8597,7 @@ ex_findpat(exarg_T *eap)
if (!ends_excmd2(eap->arg, p))
eap->errmsg = ex_errmsg(e_trailing_arg, p);
else
eap->nextcmd = check_nextcmd(p);
set_nextcmd(eap, p);
}
}
if (!eap->skip)