summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-02-17 10:01:24 +0100
committerBram Moolenaar <Bram@vim.org>2020-02-17 10:01:24 +0100
commit40d9da2a4395025169ebaf53a63618adfa737e96 (patch)
tree99b692eb931c020e2a86f2a0f0893f603e4aec69
parente51bb17dd0d51384375830ee2a1df30c08121443 (diff)
patch 8.2.0268: trycatch test failsv8.2.0268
Problem: Trycatch test fails. Solution: When calling function fails only check for following command, do not give another error.
-rw-r--r--src/userfunc.c7
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 2 deletions
diff --git a/src/userfunc.c b/src/userfunc.c
index d1d497d690..fc2161f51d 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -3560,8 +3560,11 @@ ex_call(exarg_T *eap)
// Check for trailing illegal characters and a following command.
if (!ends_excmd(*arg))
{
- emsg_severe = TRUE;
- emsg(_(e_trailing));
+ if (!failed)
+ {
+ emsg_severe = TRUE;
+ emsg(_(e_trailing));
+ }
}
else
eap->nextcmd = check_nextcmd(arg);
diff --git a/src/version.c b/src/version.c
index 73a70cdf2c..afac47d7e9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 268,
+/**/
267,
/**/
266,