mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-09-04 05:10:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.2.0985: Multiline messages not visible when mapping starts cmdline (#41405)

Browse Source 
Problem:  Multiline messages exceeding 'cmdheight' not visible when a
          mapping starts cmdline immediately after it (after 9.2.0967).
Solution: Revert patch 9.2.0967 and use a different solution (zeertzjq).

fixes:  vim/vim#21098
closes: vim/vim#21101

fb4866a2dd
This commit is contained in:
zeertzjq
2026-08-21 07:46:34 +08:00
committed by GitHub
parent 2dd6e9d6a2
commit af37d459a6
3 changed files with 48 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/nvim/message.c
View File

@@ -1453,12 +1453,10 @@ void wait_return(int redraw)
c = CAR; // just pretend CR was hit
quit_more = false;
got_int = false;
} else if (!stuff_empty() || !typebuf_typed()) {
// When there are stuffed characters or pending mapped characters, the
// next character will dismiss the hit-enter prompt immediately. A
// stuffed character then has to be put back, while a mapped character
// may even be swallowed (e.g. "g" treated as a message-scrollback key),
// so instead just don't show the hit-enter prompt at all.
} else if (!stuff_empty()) {
// When there are stuffed characters, the next stuffed character will
// dismiss the hit-enter prompt immediately and have to be put back, so
// instead just don't show the hit-enter prompt at all.
c = CAR;
} else {
State = MODE_HITRETURN;
@@ -1512,7 +1510,7 @@ void wait_return(int redraw)
// Also accept scroll-down commands when messages fill the screen,
// to avoid that typing one 'j' too many makes the messages
// disappear.
if (p_more) {
if (KeyTyped && p_more) {
if (c == 'b' || c == Ctrl_B || c == 'k' || c == 'u' || c == 'g'
|| c == K_UP || c == K_PAGEUP) {
if (msg_scrolled > Rows) {
@@ -1551,7 +1549,8 @@ void wait_return(int redraw)
if (c == K_LEFTMOUSE || c == K_MIDDLEMOUSE || c == K_RIGHTMOUSE
|| c == K_X1MOUSE || c == K_X2MOUSE) {
jump_to_mouse(MOUSE_SETPOS, NULL, 0);
} else if (vim_strchr("\r\n ", c) == NULL && c != Ctrl_C && c != 'q') {
} else if (!KeyTyped
|| (vim_strchr("\r\n ", c) == NULL && c != Ctrl_C && c != 'q')) {
// Put the character back in the typeahead buffer. Don't use the
// stuff buffer, because lmaps wouldn't work.
requeue_key(vgetc_char, vgetc_mod_mask, 0,