procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Doc fixes for timer.el (Bug#8793).

Browse source 
* emacs-lisp/timer.el (timer-activate): Remove unused arg.
(timer-activate, timer-activate-when-idle): Doc fix.
This commit is contained in:
Chong Yidong 2011-06-04 18:46:26 -04:00
parent de65b42cbf
commit 7dbe3dbc59
2 changed files with 24 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2011-06-04 Chong Yidong <cyd@stupidchicken.com>
* emacs-lisp/timer.el (timer-activate): Remove unused arg.
(timer-activate, timer-activate-when-idle): Doc fix (Bug#8793).
2011-06-04 Michael Albinus <michael.albinus@gmx.de> 2011-06-04 Michael Albinus <michael.albinus@gmx.de>
* net/tramp-sh.el (tramp-find-shell): Apply workaround also for * net/tramp-sh.el (tramp-find-shell): Apply workaround also for

38
lisp/emacs-lisp/timer.el
View file

@ -189,35 +189,35 @@ fire repeatedly that many seconds apart."
(setcdr reuse-cell timers)) (setcdr reuse-cell timers))
(setq reuse-cell (cons timer timers))) (setq reuse-cell (cons timer timers)))
;; Insert new timer after last which possibly means in front of queue. ;; Insert new timer after last which possibly means in front of queue.
(if last (cond (last (setcdr last reuse-cell))
(setcdr last reuse-cell) (idle (setq timer-idle-list reuse-cell))
(if idle (t (setq timer-list reuse-cell)))
(setq timer-idle-list reuse-cell)
(setq timer-list reuse-cell)))
(setf (timer--triggered timer) triggered-p) (setf (timer--triggered timer) triggered-p)
(setf (timer--idle-delay timer) idle) (setf (timer--idle-delay timer) idle)
nil) nil)
(error "Invalid or uninitialized timer"))) (error "Invalid or uninitialized timer")))
(defun timer-activate (timer &optional triggered-p reuse-cell idle) (defun timer-activate (timer &optional triggered-p reuse-cell)
"Put TIMER on the list of active timers. "Insert TIMER into `timer-list'.
If TRIGGERED-P is t, make TIMER inactive (put it on the list, but
mark it as already triggered). To remove it, use `cancel-timer'.
If TRIGGERED-P is t, that means to make the timer inactive REUSE-CELL, if non-nil, is a cons cell to reuse when inserting
\(put it on the list, but mark it as already triggered). TIMER into `timer-list' (usually a cell removed from that list by
To remove from the list, use `cancel-timer'. `cancel-timer-internal'; using this reduces consing for repeat
timers). If nil, allocate a new cell."
REUSE-CELL, if non-nil, is a cons cell to reuse instead
of allocating a new one."
(timer--activate timer triggered-p reuse-cell nil)) (timer--activate timer triggered-p reuse-cell nil))
(defun timer-activate-when-idle (timer &optional dont-wait reuse-cell) (defun timer-activate-when-idle (timer &optional dont-wait reuse-cell)
"Arrange to activate TIMER whenever Emacs is next idle. "Insert TIMER into `timer-idle-list'.
If optional argument DONT-WAIT is non-nil, then enable the This arranges to activate TIMER whenever Emacs is next idle.
timer to activate immediately, or at the right time, if Emacs If optional argument DONT-WAIT is non-nil, set TIMER to activate
is already idle. immediately, or at the right time, if Emacs is already idle.
REUSE-CELL, if non-nil, is a cons cell to reuse instead REUSE-CELL, if non-nil, is a cons cell to reuse when inserting
of allocating a new one." TIMER into `timer-idle-list' (usually a cell removed from that
list by `cancel-timer-internal'; using this reduces consing for
repeat timers). If nil, allocate a new cell."
(timer--activate timer (not dont-wait) reuse-cell 'idle)) (timer--activate timer (not dont-wait) reuse-cell 'idle))
(defalias 'disable-timeout 'cancel-timer) (defalias 'disable-timeout 'cancel-timer)