aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2014-05-18 09:17:10 -0400
committerStefan Monnier2014-05-18 09:17:10 -0400
commitc42ebc983bbacdb1915147cf4891a9e8000f8581 (patch)
treefee671afae268570ed9f328242177138360fca8e
parent08a2434e2f7a60fc558e052e37409333582504cb (diff)
downloademacs-c42ebc983bbacdb1915147cf4891a9e8000f8581.tar.gz
emacs-c42ebc983bbacdb1915147cf4891a9e8000f8581.zip
* lisp/emacs-lisp/timer.el (timer-event-handler): Fix last change.
Fixes: debbugs:17392
-rw-r--r--lisp/emacs-lisp/timer.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el
index 516ea3643d5..7fc6bf7b920 100644
--- a/lisp/emacs-lisp/timer.el
+++ b/lisp/emacs-lisp/timer.el
@@ -297,7 +297,7 @@ This function is called, by name, directly by the C code."
297 ;; - A runs and a does a sit-for. 297 ;; - A runs and a does a sit-for.
298 ;; - during sit-for we run timer D which cancels timer B. 298 ;; - during sit-for we run timer D which cancels timer B.
299 ;; - timer A finally finishes, so we move on to timers B and C. 299 ;; - timer A finally finishes, so we move on to timers B and C.
300 (unless cell 300 (when cell
301 ;; Re-schedule if requested. 301 ;; Re-schedule if requested.
302 (if (timer--repeat-delay timer) 302 (if (timer--repeat-delay timer)
303 (if (timer--idle-delay timer) 303 (if (timer--idle-delay timer)