diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-05-18 09:17:10 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-05-18 09:17:10 -0400 |
| commit | c42ebc983bbacdb1915147cf4891a9e8000f8581 (patch) | |
| tree | fee671afae268570ed9f328242177138360fca8e /lisp/emacs-lisp/timer.el | |
| parent | 08a2434e2f7a60fc558e052e37409333582504cb (diff) | |
| download | emacs-c42ebc983bbacdb1915147cf4891a9e8000f8581.tar.gz emacs-c42ebc983bbacdb1915147cf4891a9e8000f8581.tar.bz2 emacs-c42ebc983bbacdb1915147cf4891a9e8000f8581.zip | |
* lisp/emacs-lisp/timer.el (timer-event-handler): Fix last change.
Fixes: debbugs:17392
Diffstat (limited to 'lisp/emacs-lisp/timer.el')
| -rw-r--r-- | lisp/emacs-lisp/timer.el | 2 |
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." ;; - A runs and a does a sit-for. ;; - during sit-for we run timer D which cancels timer B. ;; - timer A finally finishes, so we move on to timers B and C. - (unless cell + (when cell ;; Re-schedule if requested. (if (timer--repeat-delay timer) (if (timer--idle-delay timer) |