Mercurial > emacs
changeset 104798:b04b1ea82ee0
(time-to-seconds): In Emacs, make it an obsolete alias for float-time.
(time-to-number-of-days): In Emacs, use float-time.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Wed, 02 Sep 2009 03:22:30 +0000 |
parents | cfe03355665f |
children | e376a250f942 |
files | lisp/calendar/time-date.el |
diffstat | 1 files changed, 17 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/calendar/time-date.el Wed Sep 02 03:22:00 2009 +0000 +++ b/lisp/calendar/time-date.el Wed Sep 02 03:22:30 2009 +0000 @@ -111,14 +111,20 @@ (timezone-make-date-arpa-standard date))) (error (error "Invalid date: %s" date)))) -;;;###autoload -(defun time-to-seconds (time) - "Convert time value TIME to a floating point number. -You can use `float-time' instead." - (with-decoded-time-value ((high low micro time)) - (+ (* 1.0 high 65536) - low - (/ micro 1000000.0)))) +;; Bit of a mess. Emacs has float-time since at least 21.1. +;; This file is synced to Gnus, and XEmacs packages may have been written +;; using time-to-seconds from the Gnus library. +;;;###autoload(if (featurep 'xemacs) +;;;###autoload (autoload 'time-to-seconds "time-date") +;;;###autoload (define-obsolete-function-alias 'time-to-seconds 'float-time "21.1")) + +(if (featurep 'xemacs) + (defun time-to-seconds (time) + "Convert time value TIME to a floating point number." + (with-decoded-time-value ((high low micro time)) + (+ (* 1.0 high 65536) + low + (/ micro 1000000.0))))) ;;;###autoload (defun seconds-to-time (seconds) @@ -245,7 +251,9 @@ (defun time-to-number-of-days (time) "Return the number of days represented by TIME. The number of days will be returned as a floating point number." - (/ (time-to-seconds time) (* 60 60 24))) + (/ (if (featurep 'xemacs) + (time-to-seconds time) + (float-time time)) (* 60 60 24))) ;;;###autoload (defun safe-date-to-time (date)