patch 8.1.1491: when skipping over code a function call may cause trouble
Problem: When skipping over code after an exception was thrown expression
evaluation is aborted after a function call. (Ingo Karkat)
Solution: Do not fail if not executing the expression. (closes #4507)
diff --git a/src/eval.c b/src/eval.c
index abb3b40..c86d0a6 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -4592,7 +4592,7 @@
/* Stop the expression evaluation when immediately
* aborting on error, or when an interrupt occurred or
* an exception was thrown but not caught. */
- if (aborting())
+ if (evaluate && aborting())
{
if (ret == OK)
clear_tv(rettv);
diff --git a/src/testdir/test_eval_stuff.vim b/src/testdir/test_eval_stuff.vim
index c779723..db68e2a 100644
--- a/src/testdir/test_eval_stuff.vim
+++ b/src/testdir/test_eval_stuff.vim
@@ -178,3 +178,12 @@
call assert_fails('source Xversionscript', 'E999:')
call delete('Xversionscript')
endfunc
+
+" Test fix for issue #4507
+func Test_skip_after_throw()
+ try
+ throw 'something'
+ let x = wincol() || &ts
+ catch /something/
+ endtry
+endfunc
diff --git a/src/version.c b/src/version.c
index 75ebdc1..79d0400 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1491,
+/**/
1490,
/**/
1489,