From: Shougo Matsushita <Shougo.Matsu@gmail.com>
Date: Tue, 30 Aug 2022 10:54:21 +0000 (+0100)
Subject: patch 9.0.0326: some changes for cmdheight=0 are not needed
X-Git-Tag: v9.0.0326
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0e412be00f8290e0575c7f72ec080725631eff38;p=vim

patch 9.0.0326: some changes for cmdheight=0 are not needed

Problem:    Some changes for cmdheight=0 are not needed.
Solution:   Revert resize behavior if height is greater than the available
            space. (Shougo Matsushita, closes #11008)
---

diff --git a/src/version.c b/src/version.c
index 5e1d931e9..505fe4fbe 100644
--- a/src/version.c
+++ b/src/version.c
@@ -707,6 +707,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    326,
 /**/
     325,
 /**/
diff --git a/src/window.c b/src/window.c
index 9c4a19983..7ea7b5b2a 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5694,10 +5694,8 @@ frame_setheight(frame_T *curfrp, int height)
 	// topframe: can only change the command line height
 	if (height > ROWS_AVAIL)
 	    // If height is greater than the available space, try to create
-	    // space for the frame by reducing 'cmdheight' if possible, while
-	    // making sure `cmdheight` doesn't go below 1.
-	    height = MIN((p_ch > 0 ? ROWS_AVAIL + (p_ch - 1)
-							: ROWS_AVAIL), height);
+	    // space for the frame by reducing 'cmdheight' if possible.
+	    height = ROWS_AVAIL;
 	if (height > 0)
 	    frame_new_height(curfrp, height, FALSE, FALSE);
     }