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
index 8e68d94..2dac487 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5330,17 +5330,21 @@
{
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