Merge from emacs--rel--22

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

diff --git a/lisp/play/solitaire.el b/lisp/play/solitaire.el
index 22dcea475992265f9c67d09b5c2647e1f8741b8c..e5dde1fe79c4e21eb17c2f4b675d657834b1c2a7 100644 (file)
--- a/lisp/play/solitaire.el
+++ b/lisp/play/solitaire.el
@@ -1,6 +1,7 @@
 ;;; solitaire.el --- game of solitaire in Emacs Lisp
 
-;; Copyright (C) 1994, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Jan Schormann <Jan.Schormann@rechen-gilde.de>
 ;; Created: Fri afternoon, Jun  3,  1994
@@ -10,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,
@@ -20,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -399,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))))
@@ -445,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)