changeset 25613:994cad298596 v8.2.3343

patch 8.2.3343: Vim9: autoload test fails Commit: https://github.com/vim/vim/commit/4830c211a47f39edcf1827ffd787306faf65c2a5 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Aug 14 14:59:27 2021 +0200 patch 8.2.3343: Vim9: autoload test fails Problem: Vim9: autoload test fails. Solution: Adjust the way the second message is avoided
author Bram Moolenaar <Bram@vim.org>
date Sat, 14 Aug 2021 15:00:04 +0200
parents 0d5300e4a3be
children 614b1cf6ca62
files src/evalvars.c src/version.c
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -1184,7 +1184,6 @@ list_arg_vars(exarg_T *eap, char_u *arg,
     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,
 	    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;
 	    }
--- 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,