* 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.

1 files changed, 5 insertions, 0 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