From 120034b30905a743746f8de9ebc59036c4c5d92e Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Fri, 12 Jul 2002 11:56:42 +0000 Subject: [PATCH] (timer-set-time-with-usecs): Fix documentation. Simplify extraction of time data. --- lisp/ChangeLog | 5 +++++ lisp/timer.el | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d53059efb6b..e93b2cfd2a4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2002-07-12 Juanma Barranquero + + * timer.el (timer-set-time-with-usecs): Fix documentation. Simplify + extraction of time data. + 2002-07-12 John Paul Wallington * help-fns.el (describe-variable): Mention if the variable is an diff --git a/lisp/timer.el b/lisp/timer.el index 0c159c6023d..c98d160d57f 100644 --- a/lisp/timer.el +++ b/lisp/timer.el @@ -137,14 +137,15 @@ SECS may be a fraction." (aset timer 3 (or (nth 2 time) 0)))) (defun timer-set-time-with-usecs (timer time usecs &optional delta) - "Set the trigger time of TIMER to TIME. + "Set the trigger time of TIMER to TIME plus USECS. TIME must be in the internal format returned by, e.g., `current-time'. -If optional third argument DELTA is a non-zero integer, make the timer +The microsecond count from TIME is ignored, and USECS is used instead. +If optional fourth argument DELTA is a non-zero integer, make the timer fire repeatedly that many seconds apart." (or (timerp timer) (error "Invalid timer")) - (aset timer 1 (car time)) - (aset timer 2 (if (consp (cdr time)) (car (cdr time)) (cdr time))) + (aset timer 1 (nth 0 time)) + (aset timer 2 (nth 1 time)) (aset timer 3 usecs) (aset timer 4 (and (numberp delta) (> delta 0) delta)) timer)