From: Chong Yidong <cyd@stupidchicken.com>
Date: Mon, 25 Feb 2008 16:04:54 +0000 (+0000)
Subject: (command_loop_1): Revert 2006-10-09 change.
X-Git-Tag: emacs-pretest-22.1.92~78
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=933930d44f0121c9f7afac0dfc15a5df1aa80459;p=emacs.git

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

diff --git a/src/keyboard.c b/src/keyboard.c
index 20ecf203324..178fa067210 100644
--- 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);