* lisp/play/5x5.el: I/ Add an arithmetic solver to suggest positions to

[bpt/emacs.git] / lisp / play / hanoi.el

diff --git a/lisp/play/hanoi.el b/lisp/play/hanoi.el
index 296ca82..ac78a86 100644 (file)
--- a/lisp/play/hanoi.el
+++ b/lisp/play/hanoi.el
@@ -6,7 +6,7 @@
 
 ; Author (a) 1985, Damon Anton Permezel
 ; This is in the public domain
-; since he distributed it without copyright notice in 1985.
+; since he distributed it in 1985 without copyright notice.
 ;; This file is part of GNU Emacs.
 ;
 ; Support for horizontal poles, large numbers of rings, real-time,
@@ -71,33 +71,33 @@
   :group 'games)
 
 (defcustom hanoi-horizontal-flag nil
-  "*If non-nil, hanoi poles are oriented horizontally."
+  "If non-nil, hanoi poles are oriented horizontally."
   :group 'hanoi :type 'boolean)
 
 (defcustom hanoi-move-period 1.0
-  "*Time, in seconds, for each pole-to-pole move of a ring.
+  "Time, in seconds, for each pole-to-pole move of a ring.
 If nil, move rings as fast as possible while displaying all
 intermediate positions."
   :group 'hanoi :type '(restricted-sexp :match-alternatives (numberp 'nil)))
 
 (defcustom hanoi-use-faces nil
-  "*If nil, all hanoi-*-face variables are ignored."
+  "If nil, all hanoi-*-face variables are ignored."
   :group 'hanoi :type 'boolean)
 
 (defcustom hanoi-pole-face 'highlight
-  "*Face for poles.  Ignored if hanoi-use-faces is nil."
+  "Face for poles.  Ignored if hanoi-use-faces is nil."
   :group 'hanoi :type 'face)
 
 (defcustom hanoi-base-face 'highlight
-  "*Face for base.  Ignored if hanoi-use-faces is nil."
+  "Face for base.  Ignored if hanoi-use-faces is nil."
   :group 'hanoi :type 'face)
 
 (defcustom hanoi-even-ring-face 'region
-  "*Face for even-numbered rings.  Ignored if hanoi-use-faces is nil."
+  "Face for even-numbered rings.  Ignored if hanoi-use-faces is nil."
   :group 'hanoi :type 'face)
 
 (defcustom hanoi-odd-ring-face 'secondary-selection
-  "*Face for odd-numbered rings.  Ignored if hanoi-use-faces is nil."
+  "Face for odd-numbered rings.  Ignored if hanoi-use-faces is nil."
   :group 'hanoi :type 'face)
 
 
@@ -133,7 +133,7 @@ Repent before ring 31 moves."
 ;;;###autoload
 (defun hanoi-unix-64 ()
   "Like hanoi-unix, but pretend to have a 64-bit clock.
-This is, necessarily (as of emacs 20.3), a crock.  When the
+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)
@@ -150,9 +150,10 @@ Start after n steps, where BITS is a big-endian list of the bits of n.
 BITS must be of length nrings.  Start at START-TIME."
   (switch-to-buffer "*Hanoi*")
   (buffer-disable-undo (current-buffer))
+  (setq show-trailing-whitespace nil)
   (unwind-protect
       (let*
-         (;; These lines can cause emacs to crash if you ask for too
+         (;; These lines can cause Emacs to crash if you ask for too
           ;; many rings.  If you uncomment them, on most systems you
           ;; can get 10,000+ rings.
           ;;(max-specpdl-size (max max-specpdl-size (* nrings 15)))
@@ -354,7 +355,6 @@ BITS must be of length nrings.  Start at START-TIME."
         (fly-steps (abs (/ (- (cdr to) (cdr from)) fly-step)))
         (directed-fly-step (/ (- (cdr to) (cdr from)) fly-steps))
         (baseward-steps (/ (- (car to) (cdr to)) baseward-step))
-        (total-steps (+ flyward-steps fly-steps baseward-steps))
         ;; A step is a character cell.  A tick is a time-unit.  To
         ;; make horizontal and vertical motion appear roughly the
         ;; same speed, we allow one tick per horizontal step and two
@@ -399,9 +399,8 @@ BITS must be of length nrings.  Start at START-TIME."
 ;; update display and pause, quitting with a pithy comment if the user
 ;; hits a key.
 (defun hanoi-sit-for (seconds)
-  (sit-for seconds)
-  (if (input-pending-p)
-      (signal 'quit '("I can tell you've had enough"))))
+  (unless (sit-for seconds)
+    (signal 'quit '("I can tell you've had enough"))))
 
 ;; move ring to a given buffer position and update ring's car.
 (defun hanoi-ring-to-pos (ring pos)
@@ -447,5 +446,4 @@ BITS must be of length nrings.  Start at START-TIME."
 
 (provide 'hanoi)
 
-;;; arch-tag: 7a901659-4346-495c-8883-14cbf540610c
 ;;; hanoi.el ends here