From 4830c211a47f39edcf1827ffd787306faf65c2a5 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 14 Aug 2021 14:59:27 +0200 Subject: [PATCH] patch 8.2.3343: Vim9: autoload test fails Problem: Vim9: autoload test fails. Solution: Adjust the way the second message is avoided --- src/evalvars.c | 3 +-- src/version.c | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/evalvars.c b/src/evalvars.c index 3dc30e92b..90dc7fbd1 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 71633d741..b493c6341 100644 --- 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 */ +/**/ + 3343, /**/ 3342, /**/ -- 2.50.1