[Emacs-diffs] /srv/bzr/emacs/trunk r110948: * lisp/calendar/time-date.el (time-to-seconds): De-obsolete.

[Stefan Monnier]

------------------------------------------------------------
revno: 110948
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2012-11-19 11:17:49 -0500
message:
  * lisp/calendar/time-date.el (time-to-seconds): De-obsolete.
modified:
  etc/NEWS
  lisp/ChangeLog
  lisp/calendar/time-date.el

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2012-11-19 01:39:37 +0000
+++ b/etc/NEWS  2012-11-19 16:17:49 +0000
@@ -52,6 +52,7 @@
 
 * 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.

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-19 05:03:08 +0000
+++ b/lisp/ChangeLog    2012-11-19 16:17:49 +0000
@@ -1,3 +1,7 @@
+2012-11-19  Stefan Monnier  <address@hidden>
+
+       * calendar/time-date.el (time-to-seconds): De-obsolete.
+
 2012-11-19  Jay Belanger  <address@hidden>
 
        * calc/calc-forms.el (math-leap-year-p):  Fix formula for negative
@@ -7,8 +11,8 @@
 
 2012-11-19  Daniel Colascione  <address@hidden>
 
-       * 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  <address@hidden>
 

=== modified file 'lisp/calendar/time-date.el'
--- a/lisp/calendar/time-date.el        2012-06-22 21:17:42 +0000
+++ b/lisp/calendar/time-date.el        2012-11-19 16:17:49 +0000
@@ -134,9 +134,7 @@
 ;;;###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