patch 7.4.706

Problem:    Window drawn wrong when 'laststatus' is zero and there is a
            command-line window. (Yclept Nemo)
Solution:   Set the status height a bit later. (Christian Brabandt)

diff --git a/src/version.c b/src/version.c
index 0b2d6fe1abf39526155a4c7223a1c53bff723968..b6676b7620cb527880b929a7afde988757008cda 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    706,
 /**/
     705,
 /**/

diff --git a/src/window.c b/src/window.c
index eb218d5603394e65f3a50caa606eaa8d68acf9e3..952143003a8e215bbfbb44eadaeb5d39ebfc196c 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -1236,7 +1236,8 @@ win_split_ins(size, flags, new_wp, dir)
        {
            wp->w_winrow = oldwin->w_winrow + oldwin->w_height + STATUS_HEIGHT;
            wp->w_status_height = oldwin->w_status_height;
-           oldwin->w_status_height = STATUS_HEIGHT;
+           /* Don't set the status_height for oldwin yet, this might break
+            * frame_fix_height(oldwin), therefore will be set below. */
        }
 #ifdef FEAT_VERTSPLIT
        if (flags & WSP_BOT)
@@ -1244,6 +1245,11 @@ win_split_ins(size, flags, new_wp, dir)
 #endif
        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))