From: Juanma Barranquero <lekktu@gmail.com>
Date: Fri, 12 Jul 2002 11:51:22 +0000 (+0000)
Subject: (timer-set-time-with-usecs): Fix documentation. Simplify extraction of time data.
X-Git-Tag: emacs-pretest-21.2.91~164
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=533c7d22f2c09e2a92e7815412d7ac258437c5d4;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 821950a1f9d..701aacc4aed 100644
--- 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  Kenichi Handa  <handa@etl.go.jp>
 
 	* files.el (insert-directory): Be sure to bind
@@ -4263,7 +4268,7 @@
 	(toplevel): Add completion-list-mode-finish to temp-buffer-show-hook.
 
 	* language/european.el ("Polish"): Change sample text.
-	From jsbien@mimuw.edu.pl (Janusz S. Bie,Bq(B).
+	From jsbien@mimuw.edu.pl (Janusz S. Bie$,1 d(B).
 
 	* progmodes/sh-script.el (sh-indent-line): Add optional PREFIX-ARG
 	parameter.
diff --git a/lisp/timer.el b/lisp/timer.el
index 3820b57365e..a908f2a8225 100644
--- a/lisp/timer.el
+++ b/lisp/timer.el
@@ -135,14 +135,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)