# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1203955568 0
# Node ID 6d942f0a4f741c54e16172afe3657d8b10bb8ab8
# Parent  791b0be92738e9c4897abd07bbb8f795ef0a7a64
(command_loop_1): Revert 2006-10-09 change.

diff -r 791b0be92738 -r 6d942f0a4f74 src/keyboard.c
--- a/src/keyboard.c	Mon Feb 25 16:06:01 2008 +0000
+++ b/src/keyboard.c	Mon Feb 25 16:06:08 2008 +0000
@@ -1603,17 +1603,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);