# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1203955494 0
# Node ID 1a9c4513c93f95e58bf8e2bfd92cdc8fdca69c9a
# Parent  74eead1567c65f80573b2cb581a3e2e5bfb55ffa
(command_loop_1): Revert 2006-10-09 change.

diff -r 74eead1567c6 -r 1a9c4513c93f src/keyboard.c
--- a/src/keyboard.c	Mon Feb 25 16:04:45 2008 +0000
+++ b/src/keyboard.c	Mon Feb 25 16:04:54 2008 +0000
@@ -1564,17 +1564,15 @@
 
       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);