* src/keyboard.c (timer_start_idle): Call internal-timer-start-idle instead

of marking the idle timers directly.
* lisp/emacs-lisp/timer.el (timer--check): New function.
(timer--time, timer-set-function, timer-event-handler): Use it.
(timer-set-idle-time): Simplify.
(timer--activate): CSE.
(timer-event-handler): Give more info in error message.
(internal-timer-start-idle): New function, moved from C.

2 files changed, 6 insertions, 10 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 402792b5460..6fdf601fa95 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keyboard.c (timer_start_idle): Call internal-timer-start-idle instead
+        of marking the idle timers directly.
+
 2013-04-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * minibuf.c (Ftest_completion): Ignore non-string/symbol keys in hash
diff --git a/src/keyboard.c b/src/keyboard.c
index b4fafa22e41..12407bd536c 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -4198,16 +4198,7 @@ timer_start_idle (void)
   timer_last_idleness_start_time = timer_idleness_start_time;
 
   /* Mark all idle-time timers as once again candidates for running.  */
-  for (timers = Vtimer_idle_list; CONSP (timers); timers = XCDR (timers))
-    {
-      Lisp_Object timer;
-
-      timer = XCAR (timers);
-
-      if (!VECTORP (timer) || ASIZE (timer) != 9)
-        continue;
-      ASET (timer, 0, Qnil);
-    }
+  call0 (intern ("internal-timer-start-idle"));
 }
 
 /* Record that Emacs is no longer idle, so stop running idle-time timers.  */