diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-12-13 19:14:52 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-12-13 19:14:52 +0000 |
| commit | 80d60910ff493f7b8ea52156e4c7df7e70a348c6 (patch) | |
| tree | d2ba3f135760a64aa892b0f4bae7a7f597488a0f | |
| parent | 3b309f11db7904efcae0177c2825597042c07427 (diff) | |
| download | vim-git-8.2.3799.tar.gz | |
patch 8.2.3799: edit test hangs or failsv8.2.3799
Problem: Edit test hangs or fails.
Solution: Do not rethrow an exception when inside try/catch.
| -rw-r--r-- | src/userfunc.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/userfunc.c b/src/userfunc.c index cc921f5a1..42fa492d7 100644 --- a/src/userfunc.c +++ b/src/userfunc.c @@ -3176,7 +3176,7 @@ call_callback( // When a :def function was called that uses :try an error would be turned // into an exception. Need to give the error here. - if (need_rethrow && current_exception != NULL) + if (need_rethrow && current_exception != NULL && trylevel == 0) { need_rethrow = FALSE; handle_did_throw(); diff --git a/src/version.c b/src/version.c index edb1fbe4e..56d302e23 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3799, +/**/ 3798, /**/ 3797, |