diff options
author | lonerover <pathfinder1644@yahoo.com> | 2017-01-01 00:27:11 +0800 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2016-12-31 17:27:11 +0100 |
commit | aa35cd9af0a3909ae79403e56639c1b3212583a9 (patch) | |
tree | 2ecb171c0413ce792e1237ca30fe7274174cbe35 /src/nvim/message.c | |
parent | c6a50ca82c9cc014416a51aa20f778292e3bf7ed (diff) | |
download | rneovim-aa35cd9af0a3909ae79403e56639c1b3212583a9.tar.gz rneovim-aa35cd9af0a3909ae79403e56639c1b3212583a9.tar.bz2 rneovim-aa35cd9af0a3909ae79403e56639c1b3212583a9.zip |
vim-patch:7.4.1876 (#5848)
Problem: Typing "k" at the hit-enter prompt has no effect.
Solution: Don't assume recursive use of the prompt if a character was typed.
(Hirohito Higashi)
https://github.com/vim/vim/commit/a0055ad3a789b8eeb0c983d8a18d4bcaeaf456b8
Diffstat (limited to 'src/nvim/message.c')
-rw-r--r-- | src/nvim/message.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/nvim/message.c b/src/nvim/message.c index 3163a797ed..637b89ccbe 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -2030,9 +2030,10 @@ static int do_more_prompt(int typed_char) int i; // We get called recursively when a timer callback outputs a message. In - // that case don't show another prompt. Also when at the hit-Enter prompt. - if (entered || State == HITRETURN) { - return false; + // that case don't show another prompt. Also when at the hit-Enter prompt + // and nothing was typed. + if (entered || (State == HITRETURN && typed_char == 0)) { + return false; } entered = true; |