Commit 3021d3a9 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(timer_last_idleness_start_time): New variable.

(timer_start_idle): Set that.
(read_key_sequence): Use that to reset timer_idleness_start_time
to previous value.
parent 95605b1b
...@@ -664,6 +664,11 @@ Lisp_Object Vglobal_disable_point_adjustment; ...@@ -664,6 +664,11 @@ Lisp_Object Vglobal_disable_point_adjustment;
static EMACS_TIME timer_idleness_start_time; static EMACS_TIME timer_idleness_start_time;
/* After Emacs stops being idle, this saves the last value
of timer_idleness_start_time from when it was idle. */
static EMACS_TIME timer_last_idleness_start_time;
/* Global variable declarations. */ /* Global variable declarations. */
...@@ -4016,6 +4021,8 @@ timer_start_idle () ...@@ -4016,6 +4021,8 @@ timer_start_idle ()
EMACS_GET_TIME (timer_idleness_start_time); EMACS_GET_TIME (timer_idleness_start_time);
timer_last_idleness_start_time = timer_idleness_start_time;
/* Mark all idle-time timers as once again candidates for running. */ /* Mark all idle-time timers as once again candidates for running. */
for (timers = Vtimer_idle_list; CONSP (timers); timers = XCDR (timers)) for (timers = Vtimer_idle_list; CONSP (timers); timers = XCDR (timers))
{ {
...@@ -8368,6 +8375,13 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last, ...@@ -8368,6 +8375,13 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
keymap may have changed, so replay the sequence. */ keymap may have changed, so replay the sequence. */
if (BUFFERP (key)) if (BUFFERP (key))
{ {
EMACS_TIME initial_idleness_start_time
= timer_last_idleness_start_time;
/* Resume idle state, using the same start-time as before. */
timer_start_idle ();
timer_idleness_start_time = initial_idleness_start_time;
mock_input = t; mock_input = t;
/* Reset the current buffer from the selected window /* Reset the current buffer from the selected window
in case something changed the former and not the latter. in case something changed the former and not the latter.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment