diff --git a/ChangeLog b/ChangeLog
index 697a36a9..88aa5458 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
 2015-03-20  Benno Schulenberg  <bensberg@justemail.net>
-	* src/nao.c (finish_stdin_pager, cancel_stdin_pager, stdin_pager):
+	* src/nano.c (finish_stdin_pager, cancel_stdin_pager, stdin_pager):
 	Normalize the whitespace, remove an old comment, and place another
 	one better.
+	* src/text.c (do_undo): Make a message equal to another one.  It
+	was mistakenly changed in r4950.  (This	is translation-neutral.)
 
 2015-03-17  Benno Schulenberg  <bensberg@justemail.net>
 	* src/text.c (do_alt_speller): Do not set the modified flag when
diff --git a/src/text.c b/src/text.c
index b096fdba..9b2153e3 100644
--- a/src/text.c
+++ b/src/text.c
@@ -442,7 +442,7 @@ void do_undo(void)
 
     filestruct *f = fsfromline(u->mark_begin_lineno);
     if (!f) {
-	statusbar(_("Internal error: can't match line %ld.  Please save your work."), (long)u->mark_begin_lineno);
+	statusbar(_("Internal error: can't match line %d.  Please save your work."), u->mark_begin_lineno);
 	return;
     }
 #ifdef DEBUG