From 08235028a6a355a4b4afe993ac0939137aae5976 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 3 Jul 2011 23:25:23 -0700 Subject: [PATCH] * emacs-lisp/timer.el (timer--time-less-p): Use time-less-p. --- lisp/ChangeLog | 1 + lisp/emacs-lisp/timer.el | 9 +-------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index db19df15619..d137c334b07 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,6 +1,7 @@ 2011-07-04 Paul Eggert * emacs-lisp/timer.el (timer-until): Use time-subtract and float-time. + (timer--time-less-p): Use time-less-p. 2011-07-04 Juanma Barranquero diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el index e5d21c35100..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. -- 2.39.2