diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-08-24 21:56:03 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-08-24 21:56:03 +0200 |
| commit | 5ca5cc6412d7d68fd380926f9551a8b7ba335199 (patch) | |
| tree | 8f45b217f46ee530fe145ec9912305cc4aa6d165 /src/ex_docmd.c | |
| parent | 60faf8656e1a100778bf7cd4d305380fb852d540 (diff) | |
patch 8.2.3371: Vim9: :$ENV cannot be followed by ->func() in next linev8.2.3371
Problem: Vim9: :$ENV cannot be followed by ->func() in next line.
Solution: Use "$ENV" as the start of an expression. (closes #8790)
Diffstat (limited to 'src/ex_docmd.c')
| -rw-r--r-- | src/ex_docmd.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 85df6cdc27..58980738f2 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -3425,14 +3425,16 @@ find_ex_command( { char_u *pskip = skip_option_env_lead(eap->cmd); - if (vim_strchr((char_u *)"{('[\"@&", *p) != NULL + if (vim_strchr((char_u *)"{('[\"@&$", *p) != NULL || ((p = to_name_const_end(pskip)) > eap->cmd && *p != NUL)) { int oplen; int heredoc; char_u *swp; - if (*eap->cmd == '&' || (eap->cmd[0] == '@' + if (*eap->cmd == '&' + || *eap->cmd == '$' + || (eap->cmd[0] == '@' && (valid_yank_reg(eap->cmd[1], FALSE) || eap->cmd[1] == '@'))) { @@ -3443,12 +3445,14 @@ find_ex_command( p += 2; p = to_name_end(p, FALSE); } + else if (*eap->cmd == '$') + p = to_name_end(eap->cmd + 1, FALSE); else p = eap->cmd + 2; if (ends_excmd(*skipwhite(p))) { - // "&option <NL>" and "@r <NL>" is the start of an - // expression. + // "&option <NL>", "$ENV <NL>" and "@r <NL>" are the start + // of an expression. eap->cmdidx = CMD_eval; return eap->cmd; } |