mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-25 06:50:46 -08:00
Code Issues Projects Releases Wiki Activity

(timer_check): Preserve the value of deactivate-mark.

Browse source 
(command_loop_1): Undo last change.
This commit is contained in:
Gerd Moellmann 2001-03-15 16:31:51 +00:00
parent 03d1a18966
commit d0bbfc999a
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/ChangeLog
View file

@ -1,5 +1,8 @@
2001-03-15 Gerd Moellmann <gerd@gnu.org>
* keyboard.c (timer_check): Preserve the value of deactivate-mark.
(command_loop_1): Undo last change.
* xterm.c (fast_find_position): Return the correct vpos.
* data.c (store_symval_forwarding): Add parameter BUF. If BUF is

11
src/keyboard.c
View file

@ -1479,10 +1479,6 @@ command_loop_1 ()
this variable differently. */
Vdisable_point_adjustment = Qnil;
/* Process filters and timers may have messed with deactivate-mark.
reset it before we execute the command. */
Vdeactivate_mark = Qnil;
/* Execute the command. */
Vthis_command = cmd;
@ -4021,17 +4017,18 @@ timer_check (do_it_now)
if (NILP (vector[0]))
{
int was_locked = single_kboard;
int count = specpdl_ptr - specpdl;
int count = BINDING_STACK_SIZE ();
Lisp_Object old_deactivate_mark = Vdeactivate_mark;
/* Mark the timer as triggered to prevent problems if the lisp
code fails to reschedule it right. */
vector[0] = Qt;
specbind (Qinhibit_quit, Qt);
call1 (Qtimer_event_handler, chosen_timer);
Vdeactivate_mark = old_deactivate_mark;
timers_run++;
unbind_to (count, Qnil);
/* Resume allowing input from any kboard, if that was true before. */