Merge changes from emacs-23 branch

[bpt/emacs.git] / lisp / midnight.el

diff --git a/lisp/midnight.el b/lisp/midnight.el
index 9a6b162..762bc54 100644 (file)
--- a/lisp/midnight.el
+++ b/lisp/midnight.el
@@ -39,8 +39,6 @@
 (eval-when-compile
  (require 'cl))
 
-(require 'timer)
-
 (defgroup midnight nil
   "Run something every day at midnight."
   :group 'calendar
@@ -66,12 +64,6 @@ call `cancel-timer' or `timer-activate' on `midnight-timer' instead."
 
 ;;; time conversion
 
-(defun midnight-time-float (num)
-  "Convert the float number of seconds since epoch to the list of 3 integers."
-  (let* ((div (ash 1 16)) (1st (floor num div)))
-    (list 1st (floor (- num (* (float div) 1st)))
-          (round (* 10000000 (mod num 1))))))
-
 (defun midnight-buffer-display-time (&optional buffer)
   "Return the time-stamp of BUFFER, or current buffer, as float."
   (with-current-buffer (or buffer (current-buffer))