patch 8.2.0267: no check for a following cmd when calling a function fails
Problem: No check for a following command when calling a function fails.
Solution: Also check for a following command when inside a try block.
(closes #5642)
diff --git a/src/testdir/test_user_func.vim b/src/testdir/test_user_func.vim
index d10a110..872b873 100644
--- a/src/testdir/test_user_func.vim
+++ b/src/testdir/test_user_func.vim
@@ -162,3 +162,7 @@
func Test_user_method()
eval 'bar'->s:addFoo()->assert_equal('barfoo')
endfunc
+
+func Test_failed_call_in_try()
+ try | call UnknownFunc() | catch | endtry
+endfunc
diff --git a/src/userfunc.c b/src/userfunc.c
index 1c25a62..d1d497d 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -3554,7 +3554,8 @@
if (eap->skip)
--emsg_skip;
- if (!failed)
+ // When inside :try we need to check for following "| catch".
+ if (!failed || eap->cstack->cs_trylevel > 0)
{
// Check for trailing illegal characters and a following command.
if (!ends_excmd(*arg))
diff --git a/src/version.c b/src/version.c
index 67e23d5..73a70cd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 267,
+/**/
266,
/**/
265,