diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-05-16 15:24:49 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-05-16 15:24:49 +0200 |
| commit | ff65288aa89dcd50760ad942d58baff70c6e93e6 (patch) | |
| tree | 9ec3a52625bdaa6fd6ec635a9390e22ae1b6afed /src/vim9execute.c | |
| parent | 3ec3217f0491e9ba8aa8ea02f7e454cd19a287ef (diff) | |
| download | vim-git-ff65288aa89dcd50760ad942d58baff70c6e93e6.tar.gz | |
patch 8.2.2857: Vim9: exception in ISN_INSTR caught at wrong levelv8.2.2857
Problem: Vim9: exception in ISN_INSTR caught at wrong level.
Solution: Set the starting trylevel in exec_instructions(). (closes #8214)
Diffstat (limited to 'src/vim9execute.c')
| -rw-r--r-- | src/vim9execute.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/vim9execute.c b/src/vim9execute.c index ae4142b0c..425cdb9bb 100644 --- a/src/vim9execute.c +++ b/src/vim9execute.c @@ -1295,6 +1295,9 @@ exec_instructions(ectx_T *ectx) // Start execution at the first instruction. ectx->ec_iidx = 0; + // Only catch exceptions in this instruction list. + ectx->ec_trylevel_at_start = trylevel; + for (;;) { isn_T *iptr; @@ -4158,7 +4161,6 @@ call_def_function( ga_init2(&ectx.ec_trystack, sizeof(trycmd_T), 10); ga_init2(&ectx.ec_funcrefs, sizeof(partial_T *), 10); ectx.ec_did_emsg_before = did_emsg_before; - ectx.ec_trylevel_at_start = trylevel; idx = argc - ufunc->uf_args.ga_len; if (idx > 0 && ufunc->uf_va_name == NULL) |