aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Liu2011-03-26 06:11:15 +0800
committerLeo Liu2011-03-26 06:11:15 +0800
commit1f48f7d236dcf7ec26f0f8317cd26a3475126cb8 (patch)
tree770dc93c685d12b4d84520cec4bece3663fefcf3
parent2ecf6fdb2806188ebf9f54a9bbead89be4803e75 (diff)
downloademacs-1f48f7d236dcf7ec26f0f8317cd26a3475126cb8.tar.gz
emacs-1f48f7d236dcf7ec26f0f8317cd26a3475126cb8.zip
Remove unused and erroneous midnight-time-float
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/midnight.el6
2 files changed, 4 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f07ac0953ff..1be233c84b8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
12011-03-25 Leo Liu <sdl.web@gmail.com> 12011-03-25 Leo Liu <sdl.web@gmail.com>
2 2
3 * midnight.el (midnight-time-float): Remove. Note it calculates
4 the microsecond component incorrectly and seconds-to-time does the
5 same job.
6
3 * ido.el (ido-read-internal): Simplify with read-from-minibuffer. 7 * ido.el (ido-read-internal): Simplify with read-from-minibuffer.
4 (ido-completions): Remove unused arguments. (Bug#8329) 8 (ido-completions): Remove unused arguments. (Bug#8329)
5 9
diff --git a/lisp/midnight.el b/lisp/midnight.el
index 9a6b162e986..db8f6c5a3df 100644
--- a/lisp/midnight.el
+++ b/lisp/midnight.el
@@ -66,12 +66,6 @@ call `cancel-timer' or `timer-activate' on `midnight-timer' instead."
66 66
67;;; time conversion 67;;; time conversion
68 68
69(defun midnight-time-float (num)
70 "Convert the float number of seconds since epoch to the list of 3 integers."
71 (let* ((div (ash 1 16)) (1st (floor num div)))
72 (list 1st (floor (- num (* (float div) 1st)))
73 (round (* 10000000 (mod num 1))))))
74
75(defun midnight-buffer-display-time (&optional buffer) 69(defun midnight-buffer-display-time (&optional buffer)
76 "Return the time-stamp of BUFFER, or current buffer, as float." 70 "Return the time-stamp of BUFFER, or current buffer, as float."
77 (with-current-buffer (or buffer (current-buffer)) 71 (with-current-buffer (or buffer (current-buffer))