From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 2 Jun 2016 16:37:05 +0000 (+0200)
Subject: patch 7.4.1876
X-Git-Tag: v7.4.1876
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0055ad3a789b8eeb0c983d8a18d4bcaeaf456b8;p=thirdparty%2Fvim.git

patch 7.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)
---

diff --git a/src/message.c b/src/message.c
index d3572eb420..5bd602784f 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 4b7449594f..bc7892345d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1876,
 /**/
     1875,
 /**/