From 845b5c3e2ac139e8697861c6bf6fbd281dacf914 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 30 Jun 2011 18:55:02 -0700 Subject: [PATCH] * play/hanoi.el (hanoi-current-time-float): Remove. All uses replaced by float-time. --- lisp/ChangeLog | 3 +++ lisp/play/hanoi.el | 13 ++++--------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6175def190..be24c21cc5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2011-07-01 Paul Eggert + * 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 ac78a86757..31a6d6f425 100644 --- 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 -- 2.20.1