diff options
Diffstat (limited to 'src/ex_eval.c')
| -rw-r--r-- | src/ex_eval.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/ex_eval.c b/src/ex_eval.c index ee6816a396..1142280bae 100644 --- a/src/ex_eval.c +++ b/src/ex_eval.c @@ -1385,7 +1385,7 @@ ex_endwhile(exarg_T *eap) eap->errmsg = _(err); else { - fl = cstack->cs_flags[cstack->cs_idx]; + fl = cstack->cs_flags[cstack->cs_idx]; if (!(fl & csf)) { // If we are in a ":while" or ":for" but used the wrong endloop @@ -2007,6 +2007,7 @@ ex_endtry(exarg_T *eap) if (!(cstack->cs_flags[cstack->cs_idx] & CSF_TRY)) { eap->errmsg = get_end_emsg(cstack); + // Find the matching ":try" and report what's missing. idx = cstack->cs_idx; do @@ -2025,6 +2026,9 @@ ex_endtry(exarg_T *eap) */ if (did_throw) discard_current_exception(); + + // report eap->errmsg, also when there already was an error + did_emsg = FALSE; } else { @@ -2105,7 +2109,9 @@ ex_endtry(exarg_T *eap) */ (void)cleanup_conditionals(cstack, CSF_TRY | CSF_SILENT, TRUE); - leave_block(cstack); + if (cstack->cs_idx >= 0 + && (cstack->cs_flags[cstack->cs_idx] & CSF_TRY)) + leave_block(cstack); --cstack->cs_trylevel; if (!skip) |