changeset 19419:c6c9d91d8290 v8.2.0267

patch 8.2.0267: no check for a following cmd when calling a function fails Commit: https://github.com/vim/vim/commit/e51bb17dd0d51384375830ee2a1df30c08121443 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Feb 16 19:42:23 2020 +0100 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)
author Bram Moolenaar <Bram@vim.org>
date Sun, 16 Feb 2020 19:45:04 +0100
parents f3d0c7552be6
children 0e875bece7ac
files src/testdir/test_user_func.vim src/userfunc.c src/version.c
diffstat 3 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_user_func.vim
+++ b/src/testdir/test_user_func.vim
@@ -162,3 +162,7 @@ endfunc
 func Test_user_method()
   eval 'bar'->s:addFoo()->assert_equal('barfoo')
 endfunc
+
+func Test_failed_call_in_try()
+  try | call UnknownFunc() | catch | endtry
+endfunc
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -3554,7 +3554,8 @@ ex_call(exarg_T *eap)
     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))
--- 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 */
 /**/
+    267,
+/**/
     266,
 /**/
     265,