diff --git a/src/eval.c b/src/eval.c
index e9ab0359a8..f66fb1b57e 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -20786,7 +20786,8 @@ ex_function(eap)
     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 77a1e2a36e..f21e332774 100644
--- a/src/version.c
+++ b/src/version.c
@@ -709,6 +709,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    305,
 /**/
     304,
 /**/