aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/message.c
diff options
context:
space:
mode:
authorbfredl <bjorn.linse@gmail.com>2022-09-26 11:40:06 +0200
committerbfredl <bjorn.linse@gmail.com>2022-09-26 13:29:55 +0200
commitbe72af2f9b6aa9ff57ef21eb4e517a74b7c2a2da (patch)
treeca53068ff57b4115c9c152ab58849620cf49b5a4 /src/nvim/message.c
parentfe045bfd5f27abd5d55615e14c606d035e4d2533 (diff)
downloadrneovim-be72af2f9b6aa9ff57ef21eb4e517a74b7c2a2da.tar.gz
rneovim-be72af2f9b6aa9ff57ef21eb4e517a74b7c2a2da.tar.bz2
rneovim-be72af2f9b6aa9ff57ef21eb4e517a74b7c2a2da.zip
fix(cmdline): don't send invalid cursor with incsearch and cmdheight=0
fixes #20306
Diffstat (limited to 'src/nvim/message.c')
-rw-r--r--src/nvim/message.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/nvim/message.c b/src/nvim/message.c
index b3e99d99a1..e0b0dfb0bc 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -1399,13 +1399,15 @@ void msg_start(void)
msg_clr_eos();
}
+ // if cmdheight=0, we need to scroll in the first line of msg_grid upon the screen
+ if (p_ch == 0 && !ui_has(kUIMessages) && !msg_scrolled) {
+ msg_grid_validate();
+ msg_scroll_up(false, true);
+ msg_scrolled++;
+ cmdline_row = Rows - 1;
+ }
+
if (!msg_scroll && full_screen) { // overwrite last message
- if (cmdline_row >= Rows && !ui_has(kUIMessages)) {
- msg_grid_validate();
- msg_scroll_up(false, true);
- msg_scrolled++;
- cmdline_row = Rows - 1;
- }
msg_row = cmdline_row;
msg_col = cmdmsg_rl ? Columns - 1 : 0;
} else if (msg_didout || (p_ch == 0 && !ui_has(kUIMessages))) { // start message on next line