diff --git a/src/eval.c b/src/eval.c
index e9ab035..f66fb1b 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -20786,7 +20786,8 @@
     nesting = 0;
     for (;;)
     {
-	msg_scroll = TRUE;
+	if (KeyTyped)
+	    msg_scroll = TRUE;
 	need_wait_return = FALSE;
 	sourcing_lnum_off = sourcing_lnum;
 
diff --git a/src/version.c b/src/version.c
index 77a1e2a..f21e332 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    305,
+/**/
     304,
 /**/
     303,