From 39d4cab494248131b6fb07aba633aa4da7871a57 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 1 Mar 2021 21:02:46 +0100 Subject: [PATCH] patch 8.2.2560: setting 'winminheigt' does not take tabline into account Problem: Setting 'winminheigt' does not take tabline into account. Solution: Subtract the tabline from the available height. (closes #7899) --- src/testdir/test_options.vim | 20 ++++++++++++++++++++ src/version.c | 2 ++ src/window.c | 2 +- 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/testdir/test_options.vim b/src/testdir/test_options.vim index 23e0de437..2595392a0 100644 --- a/src/testdir/test_options.vim +++ b/src/testdir/test_options.vim @@ -1015,6 +1015,26 @@ func Test_opt_winminheight() set winheight& endfunc +func Test_opt_winminheight_term() + CheckRunVimInTerminal + + " The tabline should be taken into account. + let lines =<< trim END + set wmh=0 stal=2 + below sp | wincmd _ + below sp | wincmd _ + below sp | wincmd _ + below sp + 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 67fc08c68..7f1e81872 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2560, /**/ 2559, /**/ diff --git a/src/window.c b/src/window.c index 58a216daf..a810a6af2 100644 --- a/src/window.c +++ b/src/window.c @@ -5860,7 +5860,7 @@ win_setminheight(void) // loop until there is a 'winminheight' that is possible while (p_wmh > 0) { - room = Rows - p_ch; + room = Rows - p_ch - tabline_height(); needed = frame_minheight(topframe, NULL); if (room >= needed) break; -- 2.50.1