diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/calendar/time-date.el | 26 |
2 files changed, 26 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 051f09442d5..72ffb0d0de5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,14 @@ 2009-09-02 Glenn Morris <rgm@gnu.org> + * calendar/time-date.el (time-to-seconds): In Emacs, make it an obsolete + alias for float-time. + (time-to-number-of-days): In Emacs, use float-time. + * net/newst-backend.el (time-add): Suppress warnings from compat + function. + * time.el (emacs-uptime, emacs-init-time): + * net/rcirc.el (rcirc-keepalive, rcirc-handler-ctcp-KEEPALIVE): + Use float-time rather than time-to-seconds. + * minibuffer.el (completion-initials-expand): Fix typo. * faces.el (modeline, modeline-inactive, modeline-highlight) diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el index 3478f9646ea..4521398d2d4 100644 --- a/lisp/calendar/time-date.el +++ b/lisp/calendar/time-date.el @@ -111,14 +111,20 @@ and type 2 is the list (HIGH LOW MICRO)." (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 @@ The Gregorian date Sunday, December 31, 1bce is imaginary." (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) |