# HG changeset patch # User Bram Moolenaar # Date 1647972903 -3600 # Node ID a52a5e3363c4d97bee0d92de9295d722afc18cc9 # Parent 130f4082a13d5b11aad9a10a5891db61262f5fcb patch 8.2.4609: :unhide does not check for failing to close a window Commit: https://github.com/vim/vim/commit/6f2465d336a9d4afe392db4084ef7e9db17e67c1 Author: Bram Moolenaar Date: Tue Mar 22 18:13:01 2022 +0000 patch 8.2.4609: :unhide does not check for failing to close a window Problem: :unhide does not check for failing to close a window. Solution: When closing a window fails continue with the next one. Do not try closing the autocmd window. (closes #9984) diff --git a/src/buffer.c b/src/buffer.c --- a/src/buffer.c +++ b/src/buffer.c @@ -5330,17 +5330,21 @@ ex_buffer_all(exarg_T *eap) { wpnext = wp->w_next; if ((wp->w_buffer->b_nwindows > 1 - || ((cmdmod.cmod_split & WSP_VERT) - ? wp->w_height + wp->w_status_height < Rows - p_ch - - tabline_height() - : wp->w_width != Columns) - || (had_tab > 0 && wp != firstwin)) && !ONE_WINDOW - && !(wp->w_closing || wp->w_buffer->b_locked > 0)) + || ((cmdmod.cmod_split & WSP_VERT) + ? wp->w_height + wp->w_status_height < Rows - p_ch + - tabline_height() + : wp->w_width != Columns) + || (had_tab > 0 && wp != firstwin)) + && !ONE_WINDOW + && !(wp->w_closing || wp->w_buffer->b_locked > 0) + && !win_unlisted(wp)) { - win_close(wp, FALSE); - wpnext = firstwin; // just in case an autocommand does - // something strange with windows - tpnext = first_tabpage; // start all over... + if (win_close(wp, FALSE) == FAIL) + break; + // Just in case an autocommand does something strange with + // windows: start all over... + wpnext = firstwin; + tpnext = first_tabpage; open_wins = 0; } else diff --git a/src/proto/window.pro b/src/proto/window.pro --- a/src/proto/window.pro +++ b/src/proto/window.pro @@ -46,6 +46,7 @@ win_T *win_horz_neighbor(tabpage_T *tp, void win_enter(win_T *wp, int undo_sync); win_T *buf_jump_open_win(buf_T *buf); win_T *buf_jump_open_tab(buf_T *buf); +int win_unlisted(win_T *wp); void win_free_popup(win_T *win); void win_remove(win_T *wp, tabpage_T *tp); int win_alloc_lines(win_T *wp); diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim index 7be0c1815acaadff46fa5700ebe046a2bdd0666e..688508a856da55757a0a030fa7b513c132295715 GIT binary patch literal 88564 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 diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4609, +/**/ 4608, /**/ 4607, diff --git a/src/window.c b/src/window.c --- a/src/window.c +++ b/src/window.c @@ -43,7 +43,6 @@ static int frame_minheight(frame_T *topf static int may_open_tabpage(void); static int win_enter_ext(win_T *wp, int flags); static void win_free(win_T *wp, tabpage_T *tp); -static int win_unlisted(win_T *wp); static void win_append(win_T *after, win_T *wp); static void frame_append(frame_T *after, frame_T *frp); static void frame_insert(frame_T *before, frame_T *frp); @@ -5233,7 +5232,7 @@ win_free( * Return TRUE if "wp" is not in the list of windows: the autocmd window or a * popup window. */ - static int + int win_unlisted(win_T *wp) { return wp == aucmd_win || WIN_IS_POPUP(wp);