# HG changeset patch # User Bram Moolenaar # Date 1646424902 -3600 # Node ID be693de4063480f0a418486be32cd38ca86fe991 # Parent ec56a659a69ad167478bac5a6855a9445f401483 patch 8.2.4505: Vim9: outdated "autocmd nested" still works Commit: https://github.com/vim/vim/commit/f07751457c39a645009c17cd837131f6bcdd7d55 Author: Bram Moolenaar Date: Fri Mar 4 20:10:38 2022 +0000 patch 8.2.4505: Vim9: outdated "autocmd nested" still works Problem: Vim9: outdated "autocmd nested" still works. Solution: Do not accept the :autocmd argument "nested" without "++" in Vim9 script. diff --git a/src/autocmd.c b/src/autocmd.c --- a/src/autocmd.c +++ b/src/autocmd.c @@ -921,16 +921,30 @@ do_autocmd(exarg_T *eap, char_u *arg_in, if ((STRNCMP(cmd, "++nested", 8) == 0 && VIM_ISWHITE(cmd[8]))) { if (nested) + { semsg(_(e_duplicate_argument_str), "++nested"); + return; + } nested = TRUE; cmd = skipwhite(cmd + 8); } - // Check for the old "nested" flag. + // Check for the old "nested" flag in legacy script. if (STRNCMP(cmd, "nested", 6) == 0 && VIM_ISWHITE(cmd[6])) { + if (in_vim9script()) + { + // If there ever is a :nested command this error should + // be removed and "nested" accepted as the start of the + // command. + emsg(_(e_invalid_command_nested_did_you_mean_plusplus_nested)); + return; + } if (nested) + { semsg(_(e_duplicate_argument_str), "nested"); + return; + } nested = TRUE; cmd = skipwhite(cmd + 6); } diff --git a/src/errors.h b/src/errors.h --- a/src/errors.h +++ b/src/errors.h @@ -2786,7 +2786,10 @@ EXTERN char e_this_vim_is_not_compiled_w # endif EXTERN char e_missing_argument_type_for_str[] INIT(= N_("E1077: Missing argument type for %s")); -// E1078 unused +#endif +EXTERN char e_invalid_command_nested_did_you_mean_plusplus_nested[] + INIT(= N_("E1078: Invalid command \"nested\", did you mean \"++nested\"?")); +#ifdef FEAT_EVAL EXTERN char e_cannot_declare_variable_on_command_line[] INIT(= N_("E1079: Cannot declare a variable on the command line")); EXTERN char e_invalid_assignment[] diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim index d3c9b89024dbee329847d3a22c7a7b96f13e1a19..7be0c1815acaadff46fa5700ebe046a2bdd0666e GIT binary patch literal 88263 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 diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4505, +/**/ 4504, /**/ 4503,