diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-06-02 18:37:05 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-06-02 18:37:05 +0200 |
| commit | a0055ad3a789b8eeb0c983d8a18d4bcaeaf456b8 (patch) | |
| tree | 662c2862bc104d33e6da4071a3e75df8aede5e53 | |
| parent | 8e759ba8651428995b338b66c615367259f79766 (diff) | |
| download | vim-git-7.4.1876.tar.gz | |
patch 7.4.1876v7.4.1876
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)
| -rw-r--r-- | src/message.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/message.c b/src/message.c index d3572eb42..5bd602784 100644 --- a/src/message.c +++ b/src/message.c @@ -2475,9 +2475,9 @@ 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) + * 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; diff --git a/src/version.c b/src/version.c index 4b7449594..bc7892345 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1876, +/**/ 1875, /**/ 1874, |