patch 8.2.2595: setting 'winminheight' may cause 'lines' to change
Problem: Setting 'winminheight' may cause 'lines' to change.
Solution: Also take minimal height of other tabpages into account. (#7899)
diff --git a/src/testdir/test_options.vim b/src/testdir/test_options.vim
index 2595392..54042d4 100644
--- a/src/testdir/test_options.vim
+++ b/src/testdir/test_options.vim
@@ -1035,6 +1035,27 @@
call delete('Xwinminheight')
endfunc
+func Test_opt_winminheight_term_tabs()
+ CheckRunVimInTerminal
+
+ " The tabline should be taken into account.
+ let lines =<< trim END
+ set wmh=0 stal=2
+ split
+ split
+ split
+ split
+ tabnew
+ END
+ call writefile(lines, 'Xwinminheight')
+ let buf = RunVimInTerminal('-S Xwinminheight', #{rows: 11})
+ call term_sendkeys(buf, ":set wmh=1\n")
+ call WaitForAssert({-> assert_match('E36: Not enough room', term_getline(buf, 11))})
+
+ call StopVimInTerminal(buf)
+ call delete('Xwinminheight')
+endfunc
+
" Test for the 'winminwidth' option
func Test_opt_winminwidth()
only!
diff --git a/src/version.c b/src/version.c
index f1b8232..3981323 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2595,
+/**/
2594,
/**/
2593,
diff --git a/src/window.c b/src/window.c
index a810a6a..3e32b37 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5860,8 +5860,8 @@
// loop until there is a 'winminheight' that is possible
while (p_wmh > 0)
{
- room = Rows - p_ch - tabline_height();
- needed = frame_minheight(topframe, NULL);
+ room = Rows - p_ch;
+ needed = min_rows() - 1; // 1 was added for the cmdline
if (room >= needed)
break;
--p_wmh;