4 files changed, 62 insertions, 18 deletions

diff --git a/src/nvim/eval/userfunc.c b/src/nvim/eval/userfunc.c
index f789c53870..ff86f74338 100644
--- a/src/nvim/eval/userfunc.c
+++ b/src/nvim/eval/userfunc.c
@@ -3297,21 +3297,16 @@ static void handle_defer_one(funccall_T *funccal)
     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.
-    const int save_trylevel = trylevel;
-    const bool save_did_throw = did_throw;
-    const bool save_need_rethrow = need_rethrow;
-
-    trylevel = 0;
-    did_throw = false;
-    need_rethrow = false;
+    // first statement in the function will be executed (because of the
+    // exception).  So save and restore the try/catch/throw exception
+    // state.
+    exception_state_T estate;
+    exception_state_save(&estate);
+    exception_state_clear();
 
     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;
+    exception_state_restore(&estate);
 
     tv_clear(&rettv);
     xfree(name);
diff --git a/src/nvim/ex_eval.c b/src/nvim/ex_eval.c
index c656f785c9..7412757726 100644
--- a/src/nvim/ex_eval.c
+++ b/src/nvim/ex_eval.c
@@ -661,6 +661,35 @@ static void finish_exception(except_T *excp)
   discard_exception(excp, true);
 }
 
+/// Save the current exception state in "estate"
+void exception_state_save(exception_state_T *estate)
+{
+  estate->estate_current_exception = current_exception;
+  estate->estate_did_throw = did_throw;
+  estate->estate_need_rethrow = need_rethrow;
+  estate->estate_trylevel = trylevel;
+}
+
+/// 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;
+  }
+  did_throw |= estate->estate_did_throw;
+  need_rethrow |= estate->estate_need_rethrow;
+  trylevel |= estate->estate_trylevel;
+}
+
+/// Clear the current exception state
+void exception_state_clear(void)
+{
+  current_exception = NULL;
+  did_throw = false;
+  need_rethrow = false;
+  trylevel = 0;
+}
+
 // Flags specifying the message displayed by report_pending.
 #define RP_MAKE         0
 #define RP_RESUME       1
diff --git a/src/nvim/ex_eval_defs.h b/src/nvim/ex_eval_defs.h
index 6713cdb549..442e4581cc 100644
--- a/src/nvim/ex_eval_defs.h
+++ b/src/nvim/ex_eval_defs.h
@@ -118,4 +118,14 @@ struct cleanup_stuff {
   except_T *exception;  ///< exception value
 };
 
+/// Exception state that is saved and restored when calling timer callback
+/// functions and deferred functions.
+typedef struct exception_state_S exception_state_T;
+struct exception_state_S {
+  except_T *estate_current_exception;
+  bool estate_did_throw;
+  bool estate_need_rethrow;
+  int estate_trylevel;
+};
+
 #endif  // NVIM_EX_EVAL_DEFS_H
diff --git a/test/old/testdir/test_user_func.vim b/test/old/testdir/test_user_func.vim
index ee1fd4ec5b..d65f70445d 100644
--- a/test/old/testdir/test_user_func.vim
+++ b/test/old/testdir/test_user_func.vim
@@ -796,11 +796,21 @@ endfunc
 " Test for calling a deferred function after an exception
 func Test_defer_after_exception()
   let g:callTrace = []
+  func Bar()
+    let g:callTrace += [1]
+    throw 'InnerException'
+  endfunc
+
   func Defer()
-    let g:callTrace += ['a']
-    let g:callTrace += ['b']
-    let g:callTrace += ['c']
-    let g:callTrace += ['d']
+    let g:callTrace += [2]
+    let g:callTrace += [3]
+    try
+      call Bar()
+    catch /InnerException/
+      let g:callTrace += [4]
+    endtry
+    let g:callTrace += [5]
+    let g:callTrace += [6]
   endfunc
 
   func Foo()
@@ -811,9 +821,9 @@ func Test_defer_after_exception()
   try
     call Foo()
   catch /TestException/
-    let g:callTrace += ['e']
+    let g:callTrace += [7]
   endtry
-  call assert_equal(['a', 'b', 'c', 'd', 'e'], g:callTrace)
+  call assert_equal([2, 3, 1, 4, 5, 6, 7], g:callTrace)
 
   delfunc Defer
   delfunc Foo