aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShougo <Shougo.Matsu@gmail.com>2022-09-06 23:33:25 +0900
committerGitHub <noreply@github.com>2022-09-06 07:33:25 -0700
commit87e037e26cfd53c3c34ac9029a8833023af60a56 (patch)
tree8792f478cd73667735dec287c0f855e6e6ccfd30
parent12afc344deb2df3973904fe55813d700da985dbf (diff)
downloadrneovim-87e037e26cfd53c3c34ac9029a8833023af60a56.tar.gz
rneovim-87e037e26cfd53c3c34ac9029a8833023af60a56.tar.bz2
rneovim-87e037e26cfd53c3c34ac9029a8833023af60a56.zip
fix(cmdheight=0): various issues part3 #19816
And fixed in https://github.com/neovim/neovim/pull/19801 regression. Fix #19834 Fix #19184
-rw-r--r--src/nvim/getchar.c1
-rw-r--r--src/nvim/message.c2
-rw-r--r--src/nvim/window.c6
3 files changed, 2 insertions, 7 deletions
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index 22c350d36b..e125d88395 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -1698,6 +1698,7 @@ static void getchar_common(typval_T *argvars, typval_T *rettv)
if (!ui_has_messages()) {
// redraw the screen after getchar()
update_screen(UPD_NOT_VALID);
+ clear_cmdline = true;
}
set_vim_var_nr(VV_MOUSE_WIN, 0);
diff --git a/src/nvim/message.c b/src/nvim/message.c
index d43c04b652..63012900df 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -2350,7 +2350,7 @@ bool msg_use_msgsep(void)
{
// the full-screen scroll behavior doesn't really make sense with
// 'ext_multigrid'
- return ((dy_flags & DY_MSGSEP) || ui_has(kUIMultigrid));
+ return (dy_flags & DY_MSGSEP) || ui_has(kUIMultigrid);
}
bool msg_do_throttle(void)
diff --git a/src/nvim/window.c b/src/nvim/window.c
index ca97ae6184..a6cc53080b 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -6270,12 +6270,6 @@ void 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;
- }
-
// 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
// properly for the new value.