summaryrefslogtreecommitdiffstats
path: root/src/eval.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-06-07 23:15:22 +0200
committerBram Moolenaar <Bram@vim.org>2019-06-07 23:15:22 +0200
commit606407384144df73a6154aca1d77e071fe1b7651 (patch)
tree326e43b2a4055b7b6e782a9c264c25b9f8214c98 /src/eval.c
parent4e0bf846279f3efa6299a98143033db1fdfa143a (diff)
patch 8.1.1491: when skipping over code a function call may cause troublev8.1.1491
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)
Diffstat (limited to 'src/eval.c')
-rw-r--r--src/eval.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c
index abb3b40692..c86d0a6646 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -4592,7 +4592,7 @@ eval7(
/* 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);