From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 4 Jul 2011 06:31:40 +0000 (-0700)
Subject: Merge: timer.el: Use time-date fns rather than rolling our own.
X-Git-Tag: emacs-pretest-24.0.90~104^2~152^2~205
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=396cec7251b26e5d37e9359dbf6a1b63c8f3a9e2;p=emacs.git

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.
---

396cec7251b26e5d37e9359dbf6a1b63c8f3a9e2
diff --cc lisp/ChangeLog
index 93cf3c44033,d137c334b07..b5d9005c510
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,3 -1,8 +1,10 @@@
+ 2011-07-04  Paul Eggert  <eggert@cs.ucla.edu>
+ 
 -	* emacs-lisp/timer.el (timer-until): Use time-subtract and float-time.
++	* 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