diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/calendar/time-date.el | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ab060de5782..abaa53f5e4c 100644 --- 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 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 |