Merge: timer.el: Use time-date fns rather than rolling our own.

This is simpler and helps future-proof the code.
* emacs-lisp/timer.el (timer-until): Use time-subtract and float-time.
(timer--time-less-p): Use time-less-p.

2 files changed, 9 insertions, 12 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 93cf3c44033..b5d9005c510 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2011-07-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * emacs-lisp/timer.el: Use time-date fns rather than rolling our own.
+        This is simpler and helps future-proof the code.
+        (timer-until): Use time-subtract and float-time.
+        (timer--time-less-p): Use time-less-p.
+
 2011-07-04  Juanma Barranquero  <lekktu@gmail.com>
 
         * type-break.el (timep): Use the value of `float-time' to avoid a
diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el
index 27fd79a6ad2..0e007ff7176 100644
--- a/lisp/emacs-lisp/timer.el
+++ b/lisp/emacs-lisp/timer.el
@@ -119,14 +119,7 @@ SECS may be either an integer or a floating point number."
 
 (defun timer--time-less-p (t1 t2)
   "Say whether time value T1 is less than time value T2."
-  ;; FIXME just use time-less-p.
-  (destructuring-bind (high1 low1 micro1) (timer--time t1)
-    (destructuring-bind (high2 low2 micro2) (timer--time t2)
-      (or (< high1 high2)
-          (and (= high1 high2)
-               (or (< low1 low2)
-                   (and (= low1 low2)
-                        (< micro1 micro2))))))))
+  (time-less-p (timer--time t1) (timer--time t2)))
 
 (defun timer-inc-time (timer secs &optional usecs)
   "Increment the time set in TIMER by SECS seconds and USECS microseconds.
@@ -258,10 +251,7 @@ how many will really happen.")
   "Calculate number of seconds from when TIMER will run, until TIME.
 TIMER is a timer, and stands for the time when its next repeat is scheduled.
 TIME is a time-list."
-  ;; FIXME: (float-time (time-subtract (timer--time timer) time))
-  (let ((high (- (car time) (timer--high-seconds timer)))
-        (low (- (nth 1 time) (timer--low-seconds timer))))
-    (+ low (* high 65536))))
+  (float-time (time-subtract time (timer--time timer))))
 
 (defun timer-event-handler (timer)
   "Call the handler for the timer TIMER.