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 d3572eb420892ab297cb093c716c742db1ea920c..5bd602784fe6269b95d23fdbd917ca2f9466d229 100644 (file)
--- 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 4b7449594fb88aa5eecb979bc6665298a64f4f38..bc7892345d09a35547452eee546b534df1be148f 100644 (file)
--- 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,
 /**/