summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/evalvars.c3
-rw-r--r--src/version.c2
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
@@ -756,6 +756,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3343,
+/**/
3342,
/**/
3341,