diff --git a/src/main.c b/src/main.c
index 2b45b80ecf..a57b196cf7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -375,9 +375,9 @@ main
 	setvbuf(stdout, NULL, _IOLBF, 0);
 #endif
 
-    /* This message comes before term inits, but after setting "silent_mode"
-     * when the input is not a tty. */
-    if (GARGCOUNT > 1 && !silent_mode)
+    // This message comes before term inits, but after setting "silent_mode"
+    // when the input is not a tty. Omit the message with --not-a-term.
+    if (GARGCOUNT > 1 && !silent_mode && !is_not_a_term())
 	printf(_("%d files to edit\n"), GARGCOUNT);
 
     if (params.want_full_screen && !silent_mode)
diff --git a/src/version.c b/src/version.c
index e5582e99e7..69ab34b423 100644
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1258,
 /**/
     1257,
 /**/