diff options
author | Shougo Matsushita <Shougo.Matsu@gmail.com> | 2022-08-30 11:54:21 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2022-08-30 11:54:21 +0100 |
commit | 0e412be00f8290e0575c7f72ec080725631eff38 (patch) | |
tree | 63a4128bfa987d94d3c9a765b852562a7a0574f4 | |
parent | 816736bcc74ddd058f68d565d9e2b2fca153c33a (diff) |
patch 9.0.0326: some changes for cmdheight=0 are not neededv9.0.0326
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)
-rw-r--r-- | src/version.c | 2 | ||||
-rw-r--r-- | src/window.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/version.c b/src/version.c index 5e1d931e9b..505fe4fbef 100644 --- a/src/version.c +++ b/src/version.c @@ -708,6 +708,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 326, +/**/ 325, /**/ 324, diff --git a/src/window.c b/src/window.c index 9c4a199836..7ea7b5b2ab 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); } |