mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-30 17:10:51 -08:00
Code Issues Projects Releases Wiki Activity

* dispnew.c (sit_for): Sit forever if TIMEOUT is t.

Browse source 
* 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.
This commit is contained in:
Chong Yidong 2006-10-10 01:20:20 +00:00
parent e29d96b65f
commit 2bcac7667a
4 changed files with 22 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,5 +1,11 @@
2006-10-09 Chong Yidong <cyd@stupidchicken.com>
* 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.

10
src/dispnew.c
View file

@ -6502,7 +6502,8 @@ Emacs was built without floating point support.
/* This is just like wait_reading_process_output, except that
it does redisplay.
TIMEOUT is number of seconds to wait (float or integer).
TIMEOUT is number of seconds to wait (float or integer),
or t to wait forever.
READING is 1 if reading input.
If DO_DISPLAY is >0 display process output while waiting.
If DO_DISPLAY is >1 perform an initial redisplay before waiting.
@ -6535,10 +6536,15 @@ sit_for (timeout, reading, do_display)
sec = (int) seconds;
usec = (int) ((seconds - sec) * 1000000);
}
else if (EQ (timeout, Qt))
{
sec = 0;
usec = 0;
}
else
wrong_type_argument (Qnumberp, timeout);
if (sec == 0 && usec == 0)
if (sec == 0 && usec == 0 && !EQ (timeout, Qt))
return Qt;
#ifdef SIGIO

10
src/keyboard.c
View file

@ -1546,15 +1546,17 @@ command_loop_1 ()
if (minibuf_level
&& !NILP (echo_area_buffer[0])
&& EQ (minibuf_window, echo_area_window)
&& NUMBERP (Vminibuffer_message_timeout))
&& EQ (minibuf_window, echo_area_window))
{
/* 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);
sit_for (Vminibuffer_message_timeout, 0, 2);
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);
@ -9982,7 +9984,7 @@ give to the command you invoke, if it asks for an argument. */)
if (NILP (echo_area_buffer[0]))
waited = sit_for (make_number (0), 0, 2);
else if (NUMBERP (Vsuggest_key_bindings))
waited = sit_for (Vminibuffer_message_timeout, 0, 2);
waited = sit_for (Vsuggest_key_bindings, 0, 2);
else
waited = sit_for (make_number (2), 0, 2);

7
src/minibuf.c
View file

@ -2714,12 +2714,9 @@ temp_echo_area_glyphs (string)
Vinhibit_quit = Qt;
if (NUMBERP (Vminibuffer_message_timeout))
{
if (Fgtr (Vminibuffer_message_timeout, make_number (0)))
sit_for (Vminibuffer_message_timeout, 0, 2);
}
sit_for (Vminibuffer_message_timeout, 0, 2);
else
sit_for (make_number (-1), 0, 2);
sit_for (Qt, 0, 2);
del_range_both (osize, osize_byte, ZV, ZV_BYTE, 1);
SET_PT_BOTH (opoint, opoint_byte);