Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 460-475)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 145-152)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-118

1 files changed, 6 insertions, 4 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index 786b3d9b556..61539a384fd 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1546,15 +1546,17 @@ command_loop_1 ()
 
       if (minibuf_level
           && !NILP (echo_area_buffer[0])
-          && EQ (minibuf_window, echo_area_window)
-          && NUMBERP (Vminibuffer_message_timeout))
+          && EQ (minibuf_window, echo_area_window))
         {
           /* 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);
 
-          sit_for (Vminibuffer_message_timeout, 0, 2);
+          if (NUMBERP (Vminibuffer_message_timeout))
+            sit_for (Vminibuffer_message_timeout, 0, 2);
+          else
+            sit_for (Qt, 0, 2);
 
           /* Clear the echo area.  */
           message2 (0, 0, 0);
@@ -9981,7 +9983,7 @@ give to the command you invoke, if it asks for an argument.  */)
       if (NILP (echo_area_buffer[0]))
         waited = sit_for (make_number (0), 0, 2);
       else if (NUMBERP (Vsuggest_key_bindings))
-        waited = sit_for (Vminibuffer_message_timeout, 0, 2);
+        waited = sit_for (Vsuggest_key_bindings, 0, 2);
       else
         waited = sit_for (make_number (2), 0, 2);