To: vim_dev@googlegroups.com
Subject: Patch 8.2.4791
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.4791
Problem:    Autocmd events triggered in different order when reusing an empty
            buffer.
Solution:   Call buff_freeall() earlier. (Charlie Groves, closes #10198)
Files:      src/buffer.c, src/testdir/test_autocmd.vim


*** ../vim-8.2.4790/src/buffer.c	2022-04-10 17:59:23.339015279 +0100
--- src/buffer.c	2022-04-19 16:23:37.943580814 +0100
***************
*** 2068,2077 ****
  	buf = curbuf;
  	// It's like this buffer is deleted.  Watch out for autocommands that
  	// change curbuf!  If that happens, allocate a new buffer anyway.
! 	if (curbuf->b_p_bl)
! 	    apply_autocmds(EVENT_BUFDELETE, NULL, NULL, FALSE, curbuf);
! 	if (buf == curbuf)
! 	    apply_autocmds(EVENT_BUFWIPEOUT, NULL, NULL, FALSE, curbuf);
  #ifdef FEAT_EVAL
  	if (aborting())		// autocmds may abort script processing
  	{
--- 2068,2076 ----
  	buf = curbuf;
  	// It's like this buffer is deleted.  Watch out for autocommands that
  	// change curbuf!  If that happens, allocate a new buffer anyway.
! 	buf_freeall(buf, BFA_WIPE | BFA_DEL);
! 	if (buf != curbuf)   // autocommands deleted the buffer!
! 	    return NULL;
  #ifdef FEAT_EVAL
  	if (aborting())		// autocmds may abort script processing
  	{
***************
*** 2079,2090 ****
  	    return NULL;
  	}
  #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)
      {
--- 2078,2083 ----
***************
*** 2132,2145 ****
  
      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.
  
  	// Init the options.
--- 2125,2130 ----
*** ../vim-8.2.4790/src/testdir/test_autocmd.vim	2022-04-12 11:32:41.428327316 +0100
--- src/testdir/test_autocmd.vim	2022-04-19 16:08:27.300227840 +0100
***************
*** 3037,3045 ****
  endfunc
  
  func Test_autocmd_vimgrep()
    augroup aucmd_vimgrep
!     au QuickfixCmdPre,BufNew,BufDelete,BufReadCmd * sb
!     au QuickfixCmdPre,BufNew,BufDelete,BufReadCmd * q9 
    augroup END
    %bwipe!
    call assert_fails('lv ?a? foo', 'E926:')
--- 3037,3046 ----
  endfunc
  
  func Test_autocmd_vimgrep()
+   %bwipe!
    augroup aucmd_vimgrep
!     au QuickfixCmdPre,BufNew,BufReadCmd * sb
!     au QuickfixCmdPre,BufNew,BufReadCmd * q9 
    augroup END
    %bwipe!
    call assert_fails('lv ?a? foo', 'E926:')
***************
*** 3160,3163 ****
--- 3161,3182 ----
  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-8.2.4790/src/version.c	2022-04-19 15:29:53.613940094 +0100
--- src/version.c	2022-04-19 16:23:12.359598430 +0100
***************
*** 748,749 ****
--- 748,751 ----
  {   /* Add new patch number below this line */
+ /**/
+     4791,
  /**/

-- 
How To Keep A Healthy Level Of Insanity:
9. As often as possible, skip rather than walk.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///