diff --git a/ChangeLog b/ChangeLog
index 8a157251..bd3b6c1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1173,7 +1173,7 @@ GNU nano 2.4.2 - 2015.07.05
 
 2015-06-11  Benno Schulenberg  <bensberg@justemail.net>
 	* src/winio.c (get_key_buffer): Add some debugging code to make it
-	easy to see what codes a key stroke produces.
+	easy to see what codes a keystroke produces.
 
 2015-06-07  Benno Schulenberg  <bensberg@justemail.net>
 	* doc/texinfo/nano.texi: Show the node with the command-line options
diff --git a/src/files.c b/src/files.c
index 836b5e13..d112fa34 100644
--- a/src/files.c
+++ b/src/files.c
@@ -2232,15 +2232,15 @@ bool write_marked_file(const char *name, FILE *f_open, bool tmp,
 int do_writeout(bool exiting)
 {
     int i;
+    bool result = FALSE;
     append_type append = OVERWRITE;
     char *given;
 	/* The filename we offer, or what the user typed so far. */
+    bool maychange = FALSE;
+	/* Whether it's okay to save the file under a different name. */
 #ifndef DISABLE_EXTRA
     static bool did_credits = FALSE;
 #endif
-    bool maychange = FALSE;
-	/* Whether it's okay to save the file under a different name. */
-    bool result = FALSE;
 
     if (exiting && ISSET(TEMP_FILE) && openfile->filename[0] != '\0') {
 	if (write_file(openfile->filename, NULL, FALSE, OVERWRITE, FALSE))
diff --git a/src/winio.c b/src/winio.c
index 002f87f7..b6327ee0 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -36,8 +36,7 @@ static size_t key_buffer_len = 0;
 static int statusblank = 0;
 	/* The number of keystrokes left before we blank the statusbar. */
 static bool suppress_cursorpos = FALSE;
-	/* Should we temporarily disable constant cursor position
-	 * display? */
+	/* Should we skip constant position display for one keystroke? */
 static bool seen_wide = FALSE;
 	/* Whether we've seen a multicolumn character in the current line. */
 
@@ -2118,13 +2117,12 @@ void statusline(message_type importance, const char *msg, ...)
     wattroff(bottomwin, A_BOLD);
     wattroff(bottomwin, interface_color_pair[STATUS_BAR].pairnum);
 
+    /* Push the message to the screen straightaway. */
     wnoutrefresh(bottomwin);
+    doupdate();
 
     suppress_cursorpos = TRUE;
 
-    /* Push the message to the screen straightaway. */
-    doupdate();
-
     /* If we're doing quick statusbar blanking, blank it after just one
      * keystroke.  Otherwise, blank it after twenty-six keystrokes, as
      * Pico does. */