patch 7.4.1835
Problem: When splitting and closing a window the status height changes.
Solution: Compute the frame height correctly. (Hirohito Higashi)
diff --git a/src/window.c b/src/window.c
index bbd0a52..01da765 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1165,8 +1165,13 @@
* one row for the status line */
win_new_height(wp, new_size);
if (flags & (WSP_TOP | WSP_BOT))
- frame_new_height(curfrp, curfrp->fr_height
- - (new_size + STATUS_HEIGHT), flags & WSP_TOP, FALSE);
+ {
+ int new_fr_height = curfrp->fr_height - new_size;
+
+ if (!((flags & WSP_BOT) && p_ls == 0))
+ new_fr_height -= STATUS_HEIGHT;
+ frame_new_height(curfrp, new_fr_height, flags & WSP_TOP, FALSE);
+ }
else
win_new_height(oldwin, oldwin_height - (new_size + STATUS_HEIGHT));
if (before) /* new window above current one */
@@ -1179,18 +1184,13 @@
{
wp->w_winrow = oldwin->w_winrow + oldwin->w_height + STATUS_HEIGHT;
wp->w_status_height = oldwin->w_status_height;
- /* Don't set the status_height for oldwin yet, this might break
- * frame_fix_height(oldwin), therefore will be set below. */
+ if (!(flags & WSP_BOT))
+ oldwin->w_status_height = STATUS_HEIGHT;
}
if (flags & WSP_BOT)
frame_add_statusline(curfrp);
frame_fix_height(wp);
frame_fix_height(oldwin);
-
- if (!before)
- /* new window above current one, set the status_height after
- * frame_fix_height(oldwin) */
- oldwin->w_status_height = STATUS_HEIGHT;
}
if (flags & (WSP_TOP | WSP_BOT))