* play/hanoi.el (hanoi-current-time-float): Remove.

All uses replaced by float-time.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6175def190fe32102badf0fa90fcc80482089d95..be24c21cc580713ebd53ea891cd4afa2340b323b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-07-01  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * play/hanoi.el (hanoi-current-time-float): Remove.
+       All uses replaced by float-time.
+
        * nxml/rng-maint.el (rng-time-function): Rewrite using time-subtract.
        This yields a more-accurate answer.
        (rng-time-to-float): Remove; no longer needed.

diff --git a/lisp/play/hanoi.el b/lisp/play/hanoi.el
index ac78a86757c481f7bc7271ca71129df5f97657dc..31a6d6f425b969b9d856d40ea0cb648fb15f98d1 100644 (file)
--- a/lisp/play/hanoi.el
+++ b/lisp/play/hanoi.el
@@ -113,7 +113,7 @@ intermediate positions."
             (prefix-numeric-value current-prefix-arg))))
   (if (< nrings 0)
       (error "Negative number of rings"))
-  (hanoi-internal nrings (make-list nrings 0) (hanoi-current-time-float)))
+  (hanoi-internal nrings (make-list nrings 0) (float-time)))
 
 ;;;###autoload
 (defun hanoi-unix ()
@@ -123,7 +123,7 @@ second since 1970-01-01 00:00:00 GMT.
 
 Repent before ring 31 moves."
   (interactive)
-  (let* ((start (ftruncate (hanoi-current-time-float)))
+  (let* ((start (ftruncate (float-time)))
         (bits (loop repeat 32
                     for x = (/ start (expt 2.0 31)) then (* x 2.0)
                     collect (truncate (mod x 2.0))))
@@ -137,7 +137,7 @@ This is, necessarily (as of Emacs 20.3), a crock.  When the
 current-time interface is made s2G-compliant, hanoi.el will need
 to be updated."
   (interactive)
-  (let* ((start (ftruncate (hanoi-current-time-float)))
+  (let* ((start (ftruncate (float-time)))
         (bits (loop repeat 64
                     for x = (/ start (expt 2.0 63)) then (* x 2.0)
                     collect (truncate (mod x 2.0))))
@@ -283,11 +283,6 @@ BITS must be of length nrings.  Start at START-TIME."
     (setq buffer-read-only t)
     (force-mode-line-update)))
 
-(defun hanoi-current-time-float ()
-  "Return values from current-time combined into a single float."
-  (destructuring-bind (high low micros) (current-time)
-    (+ (* high 65536.0) low (/ micros 1000000.0))))
-
 (defun hanoi-put-face (start end value &optional object)
   "If hanoi-use-faces is non-nil, call put-text-property for face property."
   (if hanoi-use-faces
@@ -383,7 +378,7 @@ BITS must be of length nrings.  Start at START-TIME."
                    (/ (- tick flyward-ticks fly-ticks)
                       ticks-per-pole-step))))))))
     (if hanoi-move-period
-       (loop for elapsed = (- (hanoi-current-time-float) start-time)
+       (loop for elapsed = (- (float-time) start-time)
              while (< elapsed hanoi-move-period)
              with tick-period = (/ (float hanoi-move-period) total-ticks)
              for tick = (ceiling (/ elapsed tick-period)) do