* lisp/calendar/time-date.el (time-to-seconds): De-obsolete.

diff --git a/etc/NEWS b/etc/NEWS
index c906640d80e08a8f3cc4b5b77b170cf5a5b75928..b63d3f8d538bae22d09a6c1d0ee48451852974a6 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -52,6 +52,7 @@ spurious warnings about an unused var.
 
 * Lisp changes in Emacs 24.4
 
+** time-to-seconds is not obsolete any more.
 ** New function special-form-p.
 ** Docstrings can be made dynamic by adding a `dynamic-docstring-function'
 text-property on the first char.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ab060de578232baa52df1b4aac994eb8ca1bab05..abaa53f5e4c9281d573c2be7ffabbe3067dbfc66 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * calendar/time-date.el (time-to-seconds): De-obsolete.
+
 2012-11-19  Jay Belanger  <jay.p.belanger@gmail.com>
 
        * calc/calc-forms.el (math-leap-year-p):  Fix formula for negative
@@ -7,8 +11,8 @@
 
 2012-11-19  Daniel Colascione  <dancol@dancol.org>
 
-       * term/w32-win.el (cygwin-convert-path-from-windows): Accomodate
-       rename of cygwin_convert_path* to cygwin_convert_file_name*.
+       * term/w32-win.el (cygwin-convert-path-from-windows):
+       Accomodate rename of cygwin_convert_path* to cygwin_convert_file_name*.
 
 2012-11-18  Chong Yidong  <cyd@gnu.org>
 

diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el
index 38b766084c91ecd9b2b42d217e89bff21631cb79..b953a6fb2b0d87d029557d5f6af74f4bad74de9a 100644 (file)
--- 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