mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-20 11:33:09 -08:00
Code Issues Projects Releases Wiki Activity

* keyboard.c (read_char): Don't reset idle timers if a time limit

Browse source 
is supplied.
This commit is contained in:
Chong Yidong 2006-08-14 18:32:23 +00:00
parent 82d59cb0ca
commit 70282fce62
2 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2006-08-14 Chong Yidong <cyd@stupidchicken.com>
* keyboard.c (read_char): Don't reset idle timers if a time limit
is supplied.
2006-08-14 Kim F. Storm <storm@cua.dk>
* .gdbinit (pitx): Print iterator position.

14
src/keyboard.c
View file

@ -2679,7 +2679,14 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu, end_time)
goto non_reread;
}
timer_start_idle ();
/* Start idle timers. If a time limit is supplied, we don't reset
idle timers. This avoids an infinite recursion in case an idle
timer calls `sit-for'. */
if (end_time)
timer_resume_idle ();
else
timer_start_idle ();
/* If in middle of key sequence and minibuffer not active,
start echoing if enough time elapses. */
@ -2879,7 +2886,10 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu, end_time)
/* Actually read a character, waiting if necessary. */
save_getcjmp (save_jump);
restore_getcjmp (local_getcjmp);
timer_start_idle ();
if (end_time)
timer_resume_idle ();
else
timer_start_idle ();
c = kbd_buffer_get_event (&kb, used_mouse_menu, end_time);
restore_getcjmp (save_jump);