(command_loop_1): Revert 2006-10-09 change.

diff --git a/src/keyboard.c b/src/keyboard.c
index 20ecf203324d4db4d0a15c8638d84e6bcd51de37..178fa067210ee734348427145361bea62951e16a 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1564,17 +1564,15 @@ command_loop_1 ()
 
       if (minibuf_level
          && !NILP (echo_area_buffer[0])
-         && EQ (minibuf_window, echo_area_window))
+         && EQ (minibuf_window, echo_area_window)
+         && NUMBERP (Vminibuffer_message_timeout))
        {
          /* Bind inhibit-quit to t so that C-g gets read in
             rather than quitting back to the minibuffer.  */
          int count = SPECPDL_INDEX ();
          specbind (Qinhibit_quit, Qt);
 
-         if (NUMBERP (Vminibuffer_message_timeout))
-           sit_for (Vminibuffer_message_timeout, 0, 2);
-         else
-           sit_for (Qt, 0, 2);
+         sit_for (Vminibuffer_message_timeout, 0, 2);
 
          /* Clear the echo area.  */
          message2 (0, 0, 0);