comparison src/minibuf.c @ 73318:e876a1f62fec

* dispnew.c (sit_for): Sit forever if TIMEOUT is t. * keyboard.c (command_loop_1): Handle non-number values of `minibuffer-message-timeout'. (Fexecute_extended_command): Fix typo. * minibuf.c (temp_echo_area_glyphs): Sit for `minibuffer-message-timeout' seconds.
author Chong Yidong <cyd@stupidchicken.com>
date Tue, 10 Oct 2006 01:20:20 +0000
parents 3dc812144482
children 726825bcce52 2d56e13fd23d 8dd8c8286063
comparison
equal deleted inserted replaced
73317:a8f3a59e04e0 73318:e876a1f62fec
2712 insert_from_string (string, 0, 0, SCHARS (string), SBYTES (string), 0); 2712 insert_from_string (string, 0, 0, SCHARS (string), SBYTES (string), 0);
2713 SET_PT_BOTH (opoint, opoint_byte); 2713 SET_PT_BOTH (opoint, opoint_byte);
2714 Vinhibit_quit = Qt; 2714 Vinhibit_quit = Qt;
2715 2715
2716 if (NUMBERP (Vminibuffer_message_timeout)) 2716 if (NUMBERP (Vminibuffer_message_timeout))
2717 { 2717 sit_for (Vminibuffer_message_timeout, 0, 2);
2718 if (Fgtr (Vminibuffer_message_timeout, make_number (0)))
2719 sit_for (Vminibuffer_message_timeout, 0, 2);
2720 }
2721 else 2718 else
2722 sit_for (make_number (-1), 0, 2); 2719 sit_for (Qt, 0, 2);
2723 2720
2724 del_range_both (osize, osize_byte, ZV, ZV_BYTE, 1); 2721 del_range_both (osize, osize_byte, ZV, ZV_BYTE, 1);
2725 SET_PT_BOTH (opoint, opoint_byte); 2722 SET_PT_BOTH (opoint, opoint_byte);
2726 if (!NILP (Vquit_flag)) 2723 if (!NILP (Vquit_flag))
2727 { 2724 {