[Emacs-diffs] Changes to emacs/src/keyboard.c,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/02/25 16:06:08

Index: keyboard.c
===================================================================
RCS file: /sources/emacs/emacs/src/keyboard.c,v
retrieving revision 1.946
retrieving revision 1.947
diff -u -b -r1.946 -r1.947
--- keyboard.c  12 Feb 2008 04:05:29 -0000      1.946
+++ keyboard.c  25 Feb 2008 16:06:08 -0000      1.947
@@ -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);
 
          /* Clear the echo area.  */
          message2 (0, 0, 0);