mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
patch 8.2.4706: buffer remains active with WinClosed and tabpages
Problem: Buffer remains active if a WinClosed event throws an exception when there are multiple tabpages. Solution: Ignore aborting() when closing the buffer. (closes #10101)
This commit is contained in:
@@ -365,6 +365,23 @@ func Test_WinClosed_throws()
|
|||||||
augroup! test-WinClosed
|
augroup! test-WinClosed
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func Test_WinClosed_throws_with_tabs()
|
||||||
|
tabnew
|
||||||
|
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()
|
func s:AddAnAutocmd()
|
||||||
augroup vimBarTest
|
augroup vimBarTest
|
||||||
au BufReadCmd * echo 'hello'
|
au BufReadCmd * echo 'hello'
|
||||||
|
@@ -746,6 +746,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
4706,
|
||||||
/**/
|
/**/
|
||||||
4705,
|
4705,
|
||||||
/**/
|
/**/
|
||||||
|
@@ -2814,7 +2814,7 @@ win_close_othertab(win_T *win, int free_buf, tabpage_T *tp)
|
|||||||
if (win->w_buffer != NULL)
|
if (win->w_buffer != NULL)
|
||||||
// Close the link to the buffer.
|
// Close the link to the buffer.
|
||||||
close_buffer(win, win->w_buffer, free_buf ? DOBUF_UNLOAD : 0,
|
close_buffer(win, win->w_buffer, free_buf ? DOBUF_UNLOAD : 0,
|
||||||
FALSE, FALSE);
|
FALSE, TRUE);
|
||||||
|
|
||||||
// Careful: Autocommands may have closed the tab page or made it the
|
// Careful: Autocommands may have closed the tab page or made it the
|
||||||
// current tab page.
|
// current tab page.
|
||||||
|
Reference in New Issue
Block a user