From: Paul Eggert Date: Fri, 1 Jul 2011 00:20:59 +0000 (-0700) Subject: * calendar/timeclock.el (timeclock-seconds-to-time): X-Git-Tag: emacs-pretest-24.0.90~104^2~152^2~300 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5777162a3e3c6425f300f2e6c949887b1d7a3d40;p=emacs.git * calendar/timeclock.el (timeclock-seconds-to-time): Defalias to seconds-to-time, since they're the same thing. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d7795b6e307..346c290ab7b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2011-07-01 Paul Eggert + * calendar/timeclock.el (timeclock-seconds-to-time): + Defalias to seconds-to-time, since they're the same thing. + * allout-widgets.el (allout-elapsed-time-seconds): Use float-time. 2011-06-30 Lars Magne Ingebrigtsen diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el index 8fc3f762f29..1ec474e828e 100644 --- a/lisp/calendar/timeclock.el +++ b/lisp/calendar/timeclock.el @@ -545,11 +545,7 @@ non-nil, the amount returned will be relative to past time worked." (defalias 'timeclock-time-to-seconds (if (fboundp 'float-time) 'float-time 'time-to-seconds)) -(defsubst timeclock-seconds-to-time (seconds) - "Convert SECONDS (a floating point number) to an Emacs time structure." - (list (floor seconds 65536) - (floor (mod seconds 65536)) - (floor (* (- seconds (ffloor seconds)) 1000000)))) +(defalias 'timeclock-seconds-to-time 'seconds-to-time) ;; Should today-only be removed in favour of timeclock-relative? - gm (defsubst timeclock-when-to-leave (&optional today-only)