diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2008-02-25 16:06:08 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2008-02-25 16:06:08 +0000 |
| commit | 6a8128efceee2935c40c7d091acbd1b64f891ad1 (patch) | |
| tree | ca82b031f39d0af65099bb6f74931cc4f22a909c | |
| parent | 8018d4304b9e7d060fea7091cad8e0a0927dbecb (diff) | |
| download | emacs-6a8128efceee2935c40c7d091acbd1b64f891ad1.tar.gz | |
(command_loop_1): Revert 2006-10-09 change.
| -rw-r--r-- | src/keyboard.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 21904bf9c28..2acf6aaa3cc 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -1603,17 +1603,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); |