diff options
| author | bfredl <bjorn.linse@gmail.com> | 2022-09-26 13:30:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-26 13:30:19 +0200 |
| commit | c7e74f78896ffe933e9e411563eaaaacca2622ce (patch) | |
| tree | 55ad87ed71653c79d7a562733e53bde0011cd2ba /src | |
| parent | c815aadfccd6bada47ecfb09fe188ee7f7c5caf3 (diff) | |
| parent | be72af2f9b6aa9ff57ef21eb4e517a74b7c2a2da (diff) | |
| download | rneovim-c7e74f78896ffe933e9e411563eaaaacca2622ce.tar.gz rneovim-c7e74f78896ffe933e9e411563eaaaacca2622ce.tar.bz2 rneovim-c7e74f78896ffe933e9e411563eaaaacca2622ce.zip | |
Merge pull request #20351 from bfredl/cmdfix2
fix(cmdline): don't send invalid cursor with incsearch and cmdheight=0
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/message.c | 14 |
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 |