Mercurial > vim
changeset 29700:cc0f638f5f6b v9.0.0190
patch 9.0.0190: the way 'cmdheight' can be made zero is inconsistent
Commit: https://github.com/vim/vim/commit/f797e309caff48f7a56c73b16e62ff67c4dcbdd6
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Aug 11 13:17:30 2022 +0100
patch 9.0.0190: the way 'cmdheight' can be made zero is inconsistent
Problem: The way 'cmdheight' can be made zero is inconsistent.
Solution: Only make 'cmdheight' zero when setting it explicitly, not when
resizing windows. (closes #10890)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 11 Aug 2022 14:30:05 +0200 |
| parents | 8d53de231a4d |
| children | fb297eb5987b |
| files | src/testdir/dumps/Test_changing_cmdheight_1.dump src/testdir/dumps/Test_changing_cmdheight_2.dump src/testdir/dumps/Test_changing_cmdheight_3.dump src/testdir/dumps/Test_changing_cmdheight_4.dump src/testdir/test_cmdline.vim src/version.c src/window.c |
| diffstat | 7 files changed, 78 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_changing_cmdheight_1.dump @@ -0,0 +1,8 @@ +> +0&#ffffff0@74 +|~+0#4040ff13&| @73 +|~| @73 +|[+3#0000000&|N|o| |N|a|m|e|]| @47|0|,|0|-|1| @9|A|l@1 +| +0&&@74 +@75 +@75 +|:|r|e|s|i|z|e| |-|3| @64
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_changing_cmdheight_2.dump @@ -0,0 +1,8 @@ +> +0&#ffffff0@74 +|~+0#4040ff13&| @73 +|~| @73 +|[+3#0000000&|N|o| |N|a|m|e|]| @47|0|,|0|-|1| @9|A|l@1 +|:+0&&|s|e|t| |c|m|d|h|e|i|g|h|t|+|=|3| @57 +@75 +@75 +@75
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_changing_cmdheight_3.dump @@ -0,0 +1,8 @@ +> +0&#ffffff0@74 +|~+0#4040ff13&| @73 +|[+3#0000000&|N|o| |N|a|m|e|]| @47|0|,|0|-|1| @9|A|l@1 +| +0&&@74 +@75 +@75 +@75 +@75
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_changing_cmdheight_4.dump @@ -0,0 +1,8 @@ +> +0&#ffffff0@74 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|[+3#0000000&|N|o| |N|a|m|e|]| @47|0|,|0|-|1| @9|A|l@1 +| +0&&@74 +@75 +@75
--- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -215,6 +215,35 @@ func Test_redraw_in_autocmd() call delete('XTest_redraw') endfunc +func Test_changing_cmdheight() + CheckScreendump + + let lines =<< trim END + set cmdheight=1 laststatus=2 + END + call writefile(lines, 'XTest_cmdheight') + + let buf = RunVimInTerminal('-S XTest_cmdheight', {'rows': 8}) + call term_sendkeys(buf, ":resize -3\<CR>") + call VerifyScreenDump(buf, 'Test_changing_cmdheight_1', {}) + + " using the space available doesn't change the status line + call term_sendkeys(buf, ":set cmdheight+=3\<CR>") + call VerifyScreenDump(buf, 'Test_changing_cmdheight_2', {}) + + " using more space moves the status line up + call term_sendkeys(buf, ":set cmdheight+=1\<CR>") + call VerifyScreenDump(buf, 'Test_changing_cmdheight_3', {}) + + " reducing cmdheight moves status line down + call term_sendkeys(buf, ":set cmdheight-=2\<CR>") + call VerifyScreenDump(buf, 'Test_changing_cmdheight_4', {}) + + " clean up + call StopVimInTerminal(buf) + call delete('XTest_cmdheight') +endfunc + func Test_map_completion() call feedkeys(":map <unique> <si\<Tab>\<Home>\"\<CR>", 'xt') call assert_equal('"map <unique> <silent>', getreg(':'))
--- 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 */ /**/ + 190, +/**/ 189, /**/ 188,
--- a/src/window.c +++ b/src/window.c @@ -5702,7 +5702,7 @@ frame_setheight(frame_T *curfrp, int hei if (curfrp->fr_parent == NULL) { - // topframe: can only change the command line + // 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 @@ -6089,6 +6089,12 @@ win_drag_status_line(win_T *dragwin, int int row; int up; // if TRUE, drag status line up, otherwise down int n; + static int p_ch_was_zero = FALSE; + + // If the user explicitly set 'cmdheight' to zero, then allow for dragging + // the status line making it zero again. + if (p_ch == 0) + p_ch_was_zero = TRUE; fr = dragwin->w_frame; curfr = fr; @@ -6147,6 +6153,8 @@ win_drag_status_line(win_T *dragwin, int room = Rows - cmdline_row; if (curfr->fr_next != NULL) room -= p_ch; + else if (!p_ch_was_zero) + --room; if (room < 0) room = 0; // sum up the room of frames below of the current one @@ -6196,7 +6204,7 @@ win_drag_status_line(win_T *dragwin, int row = win_comp_pos(); screen_fill(row, cmdline_row, 0, (int)Columns, ' ', ' ', 0); cmdline_row = row; - p_ch = MAX(Rows - cmdline_row, 0); + p_ch = MAX(Rows - cmdline_row, p_ch_was_zero ? 0 : 1); curtab->tp_ch_used = p_ch; redraw_all_later(SOME_VALID); showmode(); @@ -6542,6 +6550,11 @@ command_height(void) // p_ch was changed in another tab page. curtab->tp_ch_used = p_ch; + // If the space for the command line is already more than 'cmdheight' there + // is nothing to do (window size must have decreased). + if (p_ch > old_p_ch && cmdline_row <= Rows - p_ch) + return; + // Find bottom frame with width of screen. frp = lastwin->w_frame; while (frp->fr_width != Columns && frp->fr_parent != NULL)