Merge from trunk.

[gnu-emacs] / lisp / calendar / timeclock.el

diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el
index 8fc3f762f29e2c52493cd62458cb3c74b6bffe5f..1ec474e828e0c56d25977c7f72e333d36053703f 100644 (file)
--- 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)