# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1464885904 -7200
# Node ID 70d3337ff173eb43774c667145346f86965c1d3d
# Parent  fc6c7e94514bdc6e0762c103d4c863ae35abdde2
commit https://github.com/vim/vim/commit/a0055ad3a789b8eeb0c983d8a18d4bcaeaf456b8
Author: Bram Moolenaar <Bram@vim.org>
Date:   Thu Jun 2 18:37:05 2016 +0200

    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
--- 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
--- 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,