(timer-set-time-with-usecs): Fix documentation. Simplify extraction of time data.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d53059efb6bea902ccbeb7e815201bf9bf978cce..e93b2cfd2a487c6ebde6cb46f20a9377386caf6e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-12  Juanma Barranquero  <lektu@terra.es>
+
+       * timer.el (timer-set-time-with-usecs): Fix documentation. Simplify
+       extraction of time data.
+
 2002-07-12  John Paul Wallington  <jpw@shootybangbang.com>
 
        * help-fns.el (describe-variable): Mention if the variable is an

diff --git a/lisp/timer.el b/lisp/timer.el
index 0c159c6023dba8d7ab0639607fbc9d61bdc213e9..c98d160d57fb2fd07cac999c6dfa292ebf84edb5 100644 (file)
--- 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)