diff options
-rw-r--r-- | src/ex_eval.c | 9 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/ex_eval.c b/src/ex_eval.c index 370369031..2064cfa24 100644 --- a/src/ex_eval.c +++ b/src/ex_eval.c @@ -606,6 +606,8 @@ discard_exception(except_T *excp, int was_finished) { char_u *saved_IObuff; + if (current_exception == excp) + current_exception = NULL; if (excp == NULL) { internal_error("discard_exception()"); @@ -654,10 +656,7 @@ discard_exception(except_T *excp, int was_finished) discard_current_exception(void) { if (current_exception != NULL) - { discard_exception(current_exception, FALSE); - current_exception = NULL; - } did_throw = FALSE; need_rethrow = FALSE; } @@ -2284,8 +2283,8 @@ cleanup_conditionals( // Cancel the pending exception. This is in the // finally clause, so that the stack of the // caught exceptions is not involved. - discard_exception((except_T *) - cstack->cs_exception[idx], + discard_exception( + (except_T *)cstack->cs_exception[idx], FALSE); } else diff --git a/src/version.c b/src/version.c index 5ea062d05..8f2c50a9e 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2163, +/**/ 2162, /**/ 2161, |