diff options
author | zeertzjq <zeertzjq@outlook.com> | 2024-07-05 07:10:30 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-07-05 07:10:30 +0800 |
commit | 6cbba2b48d604b5fdbd874d75c30c6c55449f33e (patch) | |
tree | 9bb2c036b91845f222c09720bf4ff8fc67d43171 /src | |
parent | 6f42396cdcb54d8491a2eddcabff02f9af3268cc (diff) | |
download | rneovim-6cbba2b48d604b5fdbd874d75c30c6c55449f33e.tar.gz rneovim-6cbba2b48d604b5fdbd874d75c30c6c55449f33e.tar.bz2 rneovim-6cbba2b48d604b5fdbd874d75c30c6c55449f33e.zip |
vim-patch:9.1.0529: silent! causes following try/catch to not work (#29567)
Problem: silent! causes following try/catch to not work
(Malcolm Rowe)
Solution: consider emsg_silent in handle_did_throw() and do not abort
evaluation flow for :silent! (LemonBoy)
The silent! flag causes the evaluation not to be aborted in case of
uncaught exceptions, adjust handle_did_throw to take this detail into
account.
Fixes the long-standing todo.txt item:
```
Problem that a previous silent ":throw" causes a following try/catch not
to work. (ZyX, 2013 Sep 28) With examples: (Malcolm Rowe, 2015 Dec 24)
Also see vim/vim#8487 for an example.
```
fixes: vim/vim#538
closes: vim/vim#15128
https://github.com/vim/vim/commit/749ba0f6d922b3f6b54a66543c214479492b5a0e
Cherry-pick Test_deeply_nested_source() from patch 8.2.5169.
Co-authored-by: LemonBoy <thatlemon@gmail.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/nvim/ex_docmd.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index a6246afb41..f66464fa3a 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -972,8 +972,13 @@ void handle_did_throw(void) current_exception->throw_name = NULL; discard_current_exception(); // uses IObuff if 'verbose' - suppress_errthrow = true; - force_abort = true; + + // If "silent!" is active the uncaught exception is not fatal. + if (emsg_silent == 0) { + suppress_errthrow = true; + force_abort = true; + } + msg_ext_set_kind("emsg"); // kind=emsg for :throw, exceptions. #9993 if (messages != NULL) { |