Re: [vim/vim] Regression: Compound mapping do not show the full output (Issue #21098)
zeertzjq (Vim Github Repository) <[email protected]>
| Newsgroups | gmane.editors.vim.devel |
|---|---|
| Message-ID | <vim/vim/issues/21098/[email protected]> |
zeertzjq left a comment (vim/vim#21098)
I now have a different solution:
```diff
diff --git a/src/message.c b/src/message.c
index 1eecb053a..83016477a 100644
--- a/src/message.c
+++ b/src/message.c
@@ -1287,12 +1287,10 @@ wait_return(int redraw)
c = CAR; // no need for a return in ex mode
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
{
@@ -1361,7 +1359,7 @@ wait_return(int redraw)
* screen, to avoid that typing one 'j' too many makes the
* messages disappear.
*/
- if (p_more && !p_cp)
+ if (KeyTyped && p_more && !p_cp)
{
if (c == 'b' || c == Ctrl_B || c == 'k' || c == 'u' || c == 'g'
|| c == K_UP || c == K_PAGEUP)
@@ -1421,8 +1419,8 @@ wait_return(int redraw)
if (c == K_LEFTMOUSE || c == K_MIDDLEMOUSE || c == K_RIGHTMOUSE
|| c == K_X1MOUSE || c == K_X2MOUSE)
(void)jump_to_mouse(MOUSE_SETPOS, NULL, 0);
- else if (vim_strchr((char_u *)"\r\n ", c) == NULL && c != Ctrl_C
- && c != 'q')
+ else if (!KeyTyped || (vim_strchr((char_u *)"\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.
```
--
Reply to this email directly or view it on GitHub:
https://github.com/vim/vim/issues/21098#issuecomment-5349228018
You are receiving this because you are subscribed to this thread.
Message ID: <vim/vim/issues/21098/[email protected]>
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups "vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To view this discussion visit https://groups.google.com/d/msgid/vim_dev/vim/vim/issues/21098/5349228018%40github.com.