diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-04-06 17:59:21 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-04-06 17:59:21 +0100 |
| commit | c947b9ae419114ebfef9725814ea41a466fcf879 (patch) | |
| tree | 3f7f6e0e928cfa8bb7c11279aa1ffce6ff8048b9 | |
| parent | 75a0f3c011dfbafd2d60e87d4b2b07572df3e3ec (diff) | |
| download | vim-git-8.2.4700.tar.gz | |
patch 8.2.4700: buffer remains active if WinClosed event throws an exceptionv8.2.4700
Problem: Buffer remains active if a WinClosed event throws an exception.
Solution: Ignore aborting() when closing the buffer. (closes #10097)
| -rw-r--r-- | src/testdir/test_autocmd.vim | 17 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/window.c | 2 |
3 files changed, 20 insertions, 1 deletions
diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim index 39ba9af7d..89023a1fb 100644 --- a/src/testdir/test_autocmd.vim +++ b/src/testdir/test_autocmd.vim @@ -348,6 +348,23 @@ func Test_WinClosed() unlet g:triggered endfunc +func Test_WinClosed_throws() + vnew + let bnr = bufnr() + call assert_equal(1, bufloaded(bnr)) + augroup test-WinClosed + autocmd WinClosed * throw 'foo' + augroup END + try + close + catch /.*/ + endtry + call assert_equal(0, bufloaded(bnr)) + + autocmd! test-WinClosed + augroup! test-WinClosed +endfunc + func s:AddAnAutocmd() augroup vimBarTest au BufReadCmd * echo 'hello' diff --git a/src/version.c b/src/version.c index 120633f0f..6900961a9 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4700, +/**/ 4699, /**/ 4698, diff --git a/src/window.c b/src/window.c index 30fa80292..8ec4823a9 100644 --- a/src/window.c +++ b/src/window.c @@ -2493,7 +2493,7 @@ win_close_buffer(win_T *win, int action, int abort_if_last) set_bufref(&bufref, curbuf); win->w_closing = TRUE; - close_buffer(win, win->w_buffer, action, abort_if_last, FALSE); + close_buffer(win, win->w_buffer, action, abort_if_last, TRUE); if (win_valid_any_tab(win)) win->w_closing = FALSE; // Make sure curbuf is valid. It can become invalid if 'bufhidden' is |