summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/message.c6
-rw-r--r--src/version.c2
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,