aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/window.c
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-10-06 20:03:59 +0800
committerGitHub <noreply@github.com>2022-10-06 20:03:59 +0800
commit25dea99ce54de6a8c4369e28e0db82e1af669f24 (patch)
tree0b459d5b835bafb8f8d615deca779734eaa028d0 /src/nvim/window.c
parent2c08ab5369c79afd9138c38164e2d2c157ce8435 (diff)
downloadrneovim-25dea99ce54de6a8c4369e28e0db82e1af669f24.tar.gz
rneovim-25dea99ce54de6a8c4369e28e0db82e1af669f24.tar.bz2
rneovim-25dea99ce54de6a8c4369e28e0db82e1af669f24.zip
vim-patch:9.0.0670: no space for command line when there is a tabline (#20512)
Problem: No space for command line when there is a tabline. Solution: Correct computation of where the command line should be. (closes vim/vim#11295) https://github.com/vim/vim/commit/c9f5f73206272ccad0aa536854debc5f9781978a
Diffstat (limited to 'src/nvim/window.c')
-rw-r--r--src/nvim/window.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/window.c b/src/nvim/window.c
index ecd713013f..5993df64cd 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -4300,7 +4300,7 @@ static void enter_tabpage(tabpage_T *tp, buf_T *old_curbuf, bool trigger_enter_a
// When cmdheight is changed in a tab page with '<C-w>-', cmdline_row is
// changed but p_ch and tp_ch_used are not changed. Thus we also need to
// check cmdline_row.
- if ((row < cmdline_row) && (cmdline_row <= Rows - p_ch)) {
+ if (row < cmdline_row && cmdline_row <= Rows - p_ch) {
clear_cmdline = true;
}
@@ -6409,7 +6409,7 @@ void command_height(void)
curtab->tp_ch_used = p_ch;
// Update cmdline_row to what it should be: just below the last window.
- cmdline_row = topframe->fr_height;
+ cmdline_row = topframe->fr_height + tabline_height();
// If cmdline_row is smaller than what it is supposed to be for 'cmdheight'
// then set old_p_ch to what it would be, so that the windows get resized