diff options
Diffstat (limited to 'src/userfunc.c')
| -rw-r--r-- | src/userfunc.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/userfunc.c b/src/userfunc.c index a3b8bdc103..092b3927b5 100644 --- a/src/userfunc.c +++ b/src/userfunc.c @@ -6251,8 +6251,23 @@ handle_defer_one(funccall_T *funccal) char_u *name = dr->dr_name; dr->dr_name = NULL; + // If the deferred function is called after an exception, then only the + // first statement in the function will be executed. Save and restore + // the try/catch/throw exception state. + int save_trylevel = trylevel; + int save_did_throw = did_throw; + int save_need_rethrow = need_rethrow; + + trylevel = 0; + did_throw = FALSE; + need_rethrow = FALSE; + call_func(name, -1, &rettv, dr->dr_argcount, dr->dr_argvars, &funcexe); + trylevel = save_trylevel; + did_throw = save_did_throw; + need_rethrow = save_need_rethrow; + clear_tv(&rettv); vim_free(name); for (int i = dr->dr_argcount - 1; i >= 0; --i) |