vim-patch:9.0.2059: outstanding exceptions may be skipped (#25736)

Problem:  outstanding exceptions may be skipped
Solution: When restoring exception state, process remaining outstanding
          exceptions

closes: vim/vim#13386

https://github.com/vim/vim/commit/0ab500dede4edd8d5aee7ddc63444537be527871

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>

1 files changed, 10 insertions, 5 deletions

diff --git a/src/nvim/ex_eval.c b/src/nvim/ex_eval.c
index 7412757726..a47c9027a7 100644
--- a/src/nvim/ex_eval.c
+++ b/src/nvim/ex_eval.c
@@ -668,17 +668,21 @@ void exception_state_save(exception_state_T *estate)
   estate->estate_did_throw = did_throw;
   estate->estate_need_rethrow = need_rethrow;
   estate->estate_trylevel = trylevel;
+  estate->estate_did_emsg = did_emsg;
 }
 
 /// Restore the current exception state from "estate"
 void exception_state_restore(exception_state_T *estate)
 {
-  if (current_exception == NULL) {
-    current_exception = estate->estate_current_exception;
+  // Handle any outstanding exceptions before restoring the state
+  if (did_throw) {
+    handle_did_throw();
   }
-  did_throw |= estate->estate_did_throw;
-  need_rethrow |= estate->estate_need_rethrow;
-  trylevel |= estate->estate_trylevel;
+  current_exception = estate->estate_current_exception;
+  did_throw = estate->estate_did_throw;
+  need_rethrow = estate->estate_need_rethrow;
+  trylevel = estate->estate_trylevel;
+  did_emsg = estate->estate_did_emsg;
 }
 
 /// Clear the current exception state
@@ -688,6 +692,7 @@ void exception_state_clear(void)
   did_throw = false;
   need_rethrow = false;
   trylevel = 0;
+  did_emsg = 0;
 }
 
 // Flags specifying the message displayed by report_pending.