summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-08-10 17:23:12 +0100
committerBram Moolenaar <Bram@vim.org>2022-08-10 17:23:12 +0100
commit96bde99bf890acd9952863a02c1d15edca2000e1 (patch)
tree7dfa2f770b0a8e98bb69caa71843eaea748c55ef
parent3331dd03515655ec6b9c1bd374db6e8c27acb27a (diff)
downloadvim-git-96bde99bf890acd9952863a02c1d15edca2000e1.tar.gz
patch 9.0.0187: command line height changes when maximizing window heightv9.0.0187
Problem: Command line height changes when maximizing window height. Solution: Do not change the command line height. (closes #10885)
-rw-r--r--src/testdir/test_window_cmd.vim20
-rw-r--r--src/version.c2
-rw-r--r--src/window.c2
3 files changed, 22 insertions, 2 deletions
diff --git a/src/testdir/test_window_cmd.vim b/src/testdir/test_window_cmd.vim
index cfa5b63cf..e761c21c3 100644
--- a/src/testdir/test_window_cmd.vim
+++ b/src/testdir/test_window_cmd.vim
@@ -38,6 +38,26 @@ func Test_window_cmd_cmdwin_with_vsp()
set ls&vim
endfunc
+func Test_cmdheight_not_changed()
+ set cmdheight=2
+ set winminheight=0
+ augroup Maximize
+ autocmd WinEnter * wincmd _
+ augroup END
+ split
+ tabnew
+ tabfirst
+ call assert_equal(2, &cmdheight)
+
+ tabonly!
+ only
+ set winminwidth& cmdheight&
+ augroup Maximize
+ au!
+ augroup END
+ augroup! Maximize
+endfunc
+
" Test for jumping to windows
func Test_window_jump()
new
diff --git a/src/version.c b/src/version.c
index 6e278e5fa..1e326b31e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 187,
+/**/
186,
/**/
185,
diff --git a/src/window.c b/src/window.c
index f0d66da2f..2c7bd8edb 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5666,8 +5666,6 @@ win_setheight_win(int height, win_T *win)
if (full_screen && msg_scrolled == 0 && row < cmdline_row)
screen_fill(row, cmdline_row, 0, (int)Columns, ' ', ' ', 0);
cmdline_row = row;
- p_ch = MAX(Rows - cmdline_row, 0);
- curtab->tp_ch_used = p_ch;
msg_row = row;
msg_col = 0;