From 933930d44f0121c9f7afac0dfc15a5df1aa80459 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Mon, 25 Feb 2008 16:04:54 +0000 Subject: [PATCH] (command_loop_1): Revert 2006-10-09 change. --- src/keyboard.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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); -- 2.39.2