projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
08a2434
)
* lisp/emacs-lisp/timer.el (timer-event-handler): Fix last change.
author
Stefan Monnier
<monnier@iro.umontreal.ca>
Sun, 18 May 2014 13:17:10 +0000
(09:17 -0400)
committer
Stefan Monnier
<monnier@iro.umontreal.ca>
Sun, 18 May 2014 13:17:10 +0000
(09:17 -0400)
Fixes: debbugs:17392
lisp/emacs-lisp/timer.el
patch
|
blob
|
history
diff --git
a/lisp/emacs-lisp/timer.el
b/lisp/emacs-lisp/timer.el
index 516ea3643d5fa119faf69b421bb4b842aef4a7d9..7fc6bf7b920ca02eb8a6b959e4d7cdc21543b965 100644
(file)
--- 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)