aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/eval/userfunc.c
diff options
context:
space:
mode:
authorSean Dewar <seandewar@users.noreply.github.com>2021-10-09 01:25:11 +0100
committerzeertzjq <zeertzjq@outlook.com>2022-04-13 21:15:24 +0800
commitb6026337f25cc708e932b21a9e4e64a174a1d9da (patch)
tree12efa60054c7d8e94a7635a22f3a7b264dd6cd71 /src/nvim/eval/userfunc.c
parent4dc09f38ee709cadc745ac44a1cc24c4c526ecaf (diff)
downloadrneovim-b6026337f25cc708e932b21a9e4e64a174a1d9da.tar.gz
rneovim-b6026337f25cc708e932b21a9e4e64a174a1d9da.tar.bz2
rneovim-b6026337f25cc708e932b21a9e4e64a174a1d9da.zip
vim-patch:8.2.3416: second error is reported while exception is being thrown
Problem: Second error is reported while exception is being thrown. Solution: Do not check for trailing characters when already aborting. (closes vim/vim#8842) https://github.com/vim/vim/commit/36f691f5f1d0676f080cc97d697d742ed5cc8251
Diffstat (limited to 'src/nvim/eval/userfunc.c')
-rw-r--r--src/nvim/eval/userfunc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/eval/userfunc.c b/src/nvim/eval/userfunc.c
index eb5c6e503a..972bd81117 100644
--- a/src/nvim/eval/userfunc.c
+++ b/src/nvim/eval/userfunc.c
@@ -3018,7 +3018,7 @@ void ex_call(exarg_T *eap)
}
// When inside :try we need to check for following "| catch".
- if (!failed || eap->cstack->cs_trylevel > 0) {
+ if (!aborting() && (!failed || eap->cstack->cs_trylevel > 0)) {
// Check for trailing illegal characters and a following command.
if (!ends_excmd(*arg)) {
if (!failed) {