summaryrefslogtreecommitdiff
path: root/lisp/calendar/time-date.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2012-11-19 11:17:49 -0500
committerStefan Monnier <monnier@iro.umontreal.ca>2012-11-19 11:17:49 -0500
commit855b17af8fd8a96e1ca66a652b88f34479df12d7 (patch)
tree42bb2660c98ac384173510b1f7dec3e0fbeffe92 /lisp/calendar/time-date.el
parent020423c2c37f80e6746bce87f431a51c66082a50 (diff)
downloademacs-855b17af8fd8a96e1ca66a652b88f34479df12d7.tar.gz
* lisp/calendar/time-date.el (time-to-seconds): De-obsolete.
Diffstat (limited to 'lisp/calendar/time-date.el')
-rw-r--r--lisp/calendar/time-date.el4
1 files changed, 1 insertions, 3 deletions
diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el
index 38b766084c9..b953a6fb2b0 100644
--- a/lisp/calendar/time-date.el
+++ b/lisp/calendar/time-date.el
@@ -134,9 +134,7 @@ If DATE lacks timezone information, GMT is assumed."
;;;###autoload(if (or (featurep 'emacs)
;;;###autoload (and (fboundp 'float-time)
;;;###autoload (subrp (symbol-function 'float-time))))
-;;;###autoload (progn
-;;;###autoload (defalias 'time-to-seconds 'float-time)
-;;;###autoload (make-obsolete 'time-to-seconds 'float-time "21.1"))
+;;;###autoload (defalias 'time-to-seconds 'float-time)
;;;###autoload (autoload 'time-to-seconds "time-date"))
(eval-when-compile