diff options
| author | ckelsel <ckelsel@hotmail.com> | 2017-08-17 08:20:48 +0800 |
|---|---|---|
| committer | ckelsel <ckelsel@hotmail.com> | 2017-08-17 08:20:48 +0800 |
| commit | 673fc748237345914e0ad584bc4cba997c96a37e (patch) | |
| tree | 7f55a3b3dd362fbbc59ff204287a0aae99089e5e /src/nvim/ex_eval.c | |
| parent | 5d332084e1ca4c29b1ccb90ea44c3b861dac5701 (diff) | |
| parent | 5b32bce73c93a64970afe0e92e0a8ba2fed88619 (diff) | |
| download | rneovim-673fc748237345914e0ad584bc4cba997c96a37e.tar.gz rneovim-673fc748237345914e0ad584bc4cba997c96a37e.tar.bz2 rneovim-673fc748237345914e0ad584bc4cba997c96a37e.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/nvim/ex_eval.c')
| -rw-r--r-- | src/nvim/ex_eval.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/nvim/ex_eval.c b/src/nvim/ex_eval.c index c029df2f13..9037b3c151 100644 --- a/src/nvim/ex_eval.c +++ b/src/nvim/ex_eval.c @@ -561,7 +561,9 @@ static void discard_exception(except_T *excp, int was_finished) */ void discard_current_exception(void) { - discard_exception(current_exception, FALSE); + discard_exception(current_exception, false); + // Note: all globals manipulated here should be saved/restored in + // try_enter/try_leave. current_exception = NULL; did_throw = FALSE; need_rethrow = FALSE; |