patch 7.4.2328

Problem:    Crash when BufWinLeave autocmd goes to another tab page. (Hirohito
            Higashi)
Solution:   Make close_buffer() go back to the right window.

diff --git a/src/buffer.c b/src/buffer.c
index 648916821442b8d4a70b2f4de5e83dd3b152cfba..ac37685aa62db1fd4be76d33b5c92dc9e5c326ba 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -450,6 +450,11 @@ close_buffer(
     int                is_curbuf;
     int                nwindows;
     bufref_T   bufref;
+# ifdef FEAT_WINDOWS
+    int                is_curwin = (curwin!= NULL && curwin->w_buffer == buf);
+    win_T      *the_curwin = curwin;
+    tabpage_T  *the_curtab = curtab;
+# endif
 #endif
     int                unload_buf = (action != 0);
     int                del_buf = (action == DOBUF_DEL || action == DOBUF_WIPE);
@@ -544,6 +549,19 @@ aucmd_abort:
            return;
 # endif
     }
+
+# ifdef FEAT_WINDOWS
+    /* If the buffer was in curwin and the window has changed, go back to that
+     * window, if it still exists.  This avoids that ":edit x" triggering a
+     * "tabnext" BufUnload autocmd leaves a window behind without a buffer. */
+    if (is_curwin && curwin != the_curwin &&  win_valid_any_tab(the_curwin))
+    {
+       block_autocmds();
+       goto_tabpage_win(the_curtab, the_curwin);
+       unblock_autocmds();
+    }
+# endif
+
     nwindows = buf->b_nwindows;
 #endif
 

diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index 43aa8d48dd8d8189755f7112a0d2f1eec83e276d..c029ca1bd6a5306fad6db05454494cd83bc703ee 100644 (file)
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -83,6 +83,16 @@ function Test_autocmd_bufunload_with_tabnext()
   quit
 endfunc
 
+function Test_autocmd_bufwinleave_with_tabfirst()
+  tabedit
+  augroup sample
+    autocmd!
+    autocmd BufWinLeave <buffer> tabfirst
+  augroup END
+  call setline(1, ['a', 'b', 'c'])
+  edit! a.txt
+endfunc
+
 " SEGV occurs in older versions.  (At least 7.4.2321 or older)
 function Test_autocmd_bufunload_avoiding_SEGV_01()
   split aa.txt

diff --git a/src/version.c b/src/version.c
index 4ab697b9ba386d2d161e84cef19d47a283b51abd..89e5f9509cc1bbc2a06e5090ff3f498b25caae18 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2328,
 /**/
     2327,
 /**/