Merge from emacs--rel--22

[gnu-emacs] / lisp / play / solitaire.el

diff --git a/lisp/play/solitaire.el b/lisp/play/solitaire.el
index 38bc1e4915b755d9725f5f6bfeca13c77c20fcc6..e5dde1fe79c4e21eb17c2f4b675d657834b1c2a7 100644 (file)
--- a/lisp/play/solitaire.el
+++ b/lisp/play/solitaire.el
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -400,7 +400,7 @@ which a stone will be taken away) and target."
               (<= (current-column) solitaire-end-x)
               (>= (solitaire-current-line) solitaire-start-y)
               (<= (solitaire-current-line) solitaire-end-y)
-              (mapcar
+              (mapc
                (lambda (movesymbol)
                  (if (listp (solitaire-possible-move movesymbol))
                      (setq count (1+ count))))
@@ -446,13 +446,13 @@ Seen in info on text lines."
        ;; right S-left
        (solitaire-auto-eval nil))
     (solitaire-center-point)
-    (mapcar (lambda (op)
-             (if (memq op '(S-left S-right S-up S-down))
-                 (sit-for 0.2))
-             (execute-kbd-macro (vector op))
-             (if (memq op '(S-left S-right S-up S-down))
-                 (sit-for 0.4)))
-           allmoves))
+    (mapc (lambda (op)
+           (if (memq op '(S-left S-right S-up S-down))
+               (sit-for 0.2))
+           (execute-kbd-macro (vector op))
+           (if (memq op '(S-left S-right S-up S-down))
+               (sit-for 0.4)))
+         allmoves))
   (solitaire-do-check))
 
 (provide 'solitaire)