diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-08-14 14:59:27 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-08-14 14:59:27 +0200 |
| commit | 4830c211a47f39edcf1827ffd787306faf65c2a5 (patch) | |
| tree | 27a47faa5042d9aa47553e89c6594f7e1d2fe696 | |
| parent | b521766c56c0e17db6e8615f35cf21012af0670c (diff) | |
patch 8.2.3343: Vim9: autoload test failsv8.2.3343
Problem: Vim9: autoload test fails.
Solution: Adjust the way the second message is avoided
| -rw-r--r-- | src/evalvars.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/evalvars.c b/src/evalvars.c index 3dc30e92be..90dc7fbd1b 100644 --- a/src/evalvars.c +++ b/src/evalvars.c @@ -1184,7 +1184,6 @@ list_arg_vars(exarg_T *eap, char_u *arg, int *first) char_u *arg_subsc; char_u *tofree; typval_T tv; - int prev_uncaught_emsg = uncaught_emsg; while (!ends_excmd2(eap->cmd, arg) && !got_int) { @@ -1194,7 +1193,7 @@ list_arg_vars(exarg_T *eap, char_u *arg, int *first) if (!VIM_ISWHITE(*arg) && !ends_excmd(*arg)) { emsg_severe = TRUE; - if (uncaught_emsg == prev_uncaught_emsg) + if (!did_emsg) semsg(_(e_trailing_arg), arg); break; } diff --git a/src/version.c b/src/version.c index 71633d7416..b493c63415 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3343, +/**/ 3342, /**/ 3341, |