thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 8.2.4791: events triggered in different order when reusing buffer

Browse Source 
Problem:    Autocmd events triggered in different order when reusing an empty
            buffer.
Solution:   Call buff_freeall() earlier. (Charlie Groves, closes #10198)
This commit is contained in:
Charlie Groves 2022-04-19 16:24:12 +01:00 committed by Bram Moolenaar
parent c448e9c950
commit fef4485ef5
3 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/buffer.c
View File

@ -2068,10 +2068,9 @@ buflist_new(
buf = curbuf; buf = curbuf;
// It's like this buffer is deleted. Watch out for autocommands that // It's like this buffer is deleted. Watch out for autocommands that
// change curbuf! If that happens, allocate a new buffer anyway. // change curbuf! If that happens, allocate a new buffer anyway.
if (curbuf->b_p_bl) buf_freeall(buf, BFA_WIPE | BFA_DEL);
apply_autocmds(EVENT_BUFDELETE, NULL, NULL, FALSE, curbuf); if (buf != curbuf) // autocommands deleted the buffer!
if (buf == curbuf) return NULL;
apply_autocmds(EVENT_BUFWIPEOUT, NULL, NULL, FALSE, curbuf);
#ifdef FEAT_EVAL #ifdef FEAT_EVAL
if (aborting()) // autocmds may abort script processing if (aborting()) // autocmds may abort script processing
{ {
@ -2079,12 +2078,6 @@ buflist_new(
return NULL; return NULL;
} }
#endif #endif
if (buf == curbuf)
{
// Make sure 'bufhidden' and 'buftype' are empty
clear_string_option(&buf->b_p_bh);
clear_string_option(&buf->b_p_bt);
}
} }
if (buf != curbuf || curbuf == NULL) if (buf != curbuf || curbuf == NULL)
{ {
@ -2132,14 +2125,6 @@ buflist_new(
if (buf == curbuf) if (buf == curbuf)
{ {
// free all things allocated for this buffer
buf_freeall(buf, 0);
if (buf != curbuf) // autocommands deleted the buffer!
return NULL;
#if defined(FEAT_EVAL)
if (aborting()) // autocmds may abort script processing
return NULL;
#endif
free_buffer_stuff(buf, FALSE); // delete local variables et al. free_buffer_stuff(buf, FALSE); // delete local variables et al.
// Init the options. // Init the options.

23
src/testdir/test_autocmd.vim
View File

@ -3037,9 +3037,10 @@ func Test_autocmd_closing_cmdwin()
endfunc endfunc
func Test_autocmd_vimgrep() func Test_autocmd_vimgrep()
%bwipe!
augroup aucmd_vimgrep augroup aucmd_vimgrep
au QuickfixCmdPre,BufNew,BufDelete,BufReadCmd * sb au QuickfixCmdPre,BufNew,BufReadCmd * sb
au QuickfixCmdPre,BufNew,BufDelete,BufReadCmd * q9 au QuickfixCmdPre,BufNew,BufReadCmd * q9
augroup END augroup END
%bwipe! %bwipe!
call assert_fails('lv ?a? foo', 'E926:') call assert_fails('lv ?a? foo', 'E926:')
@ -3160,4 +3161,22 @@ func Test_v_event_readonly()
endfunc endfunc
func Test_noname_autocmd()
augroup test_noname_autocmd_group
autocmd!
autocmd BufEnter * call add(s:li, ["BufEnter", expand("<afile>")])
autocmd BufDelete * call add(s:li, ["BufDelete", expand("<afile>")])
autocmd BufLeave * call add(s:li, ["BufLeave", expand("<afile>")])
autocmd BufUnload * call add(s:li, ["BufUnload", expand("<afile>")])
autocmd BufWipeout * call add(s:li, ["BufWipeout", expand("<afile>")])
augroup END
let s:li = []
edit foo
call assert_equal([['BufUnload', ''], ['BufDelete', ''], ['BufWipeout', ''], ['BufEnter', 'foo']], s:li)
au! test_noname_autocmd_group
augroup! test_noname_autocmd_group
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab

2
src/version.c
View File

@ -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 */
/**/
4791,
/**/ /**/
4790, 4790,
/**/ /**/