Mercurial > emacs
changeset 80202:1a9c4513c93f
(command_loop_1): Revert 2006-10-09 change.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Mon, 25 Feb 2008 16:04:54 +0000 |
| parents | 74eead1567c6 |
| children | 918018f09ebd |
| files | src/keyboard.c |
| diffstat | 1 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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);