aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2008-07-24 10:55:12 +0000
committerJuanma Barranquero2008-07-24 10:55:12 +0000
commit074bd3ea76e1757c2be51742965a2447a9b61168 (patch)
tree2b0e0003b5e6e511b50bde5162deabb6055da072
parentd1c38b5722b1beec983b801a3fbd60b9483bceb5 (diff)
downloademacs-074bd3ea76e1757c2be51742965a2447a9b61168.tar.gz
emacs-074bd3ea76e1757c2be51742965a2447a9b61168.zip
* play/solitaire.el (solitaire-mode): Fix typo in docstring.
Set `show-trailing-whitespace' to nil. (solitaire, solitaire-mode-map, solitaire-mode-hook, solitaire-solve): Fix typos in docstrings.
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/play/solitaire.el15
2 files changed, 15 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d9bcf7c109d..7bfdd1aa29c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
12008-07-24 Juanma Barranquero <lekktu@gmail.com>
2
3 * play/solitaire.el (solitaire-mode): Fix typo in docstring.
4 Set `show-trailing-whitespace' to nil.
5 (solitaire, solitaire-mode-map, solitaire-mode-hook, solitaire-solve):
6 Fix typos in docstrings.
7
12008-07-24 Chong Yidong <cyd@stupidchicken.com> 82008-07-24 Chong Yidong <cyd@stupidchicken.com>
2 9
3 * textmodes/enriched.el (enriched-mode-map): Bind C-a and C-j via 10 * textmodes/enriched.el (enriched-mode-map): Bind C-a and C-j via
diff --git a/lisp/play/solitaire.el b/lisp/play/solitaire.el
index 9a138ff5f92..c8c72d76f70 100644
--- a/lisp/play/solitaire.el
+++ b/lisp/play/solitaire.el
@@ -33,15 +33,15 @@
33;;; Code: 33;;; Code:
34 34
35(defgroup solitaire nil 35(defgroup solitaire nil
36 "Game of solitaire." 36 "Game of Solitaire."
37 :prefix "solitaire-" 37 :prefix "solitaire-"
38 :group 'games) 38 :group 'games)
39 39
40(defvar solitaire-mode-map nil 40(defvar solitaire-mode-map nil
41 "Keymap for playing solitaire.") 41 "Keymap for playing Solitaire.")
42 42
43(defcustom solitaire-mode-hook nil 43(defcustom solitaire-mode-hook nil
44 "Hook to run upon entry to solitaire." 44 "Hook to run upon entry to Solitaire."
45 :type 'hook 45 :type 'hook
46 :group 'solitaire) 46 :group 'solitaire)
47 47
@@ -92,8 +92,8 @@
92(put 'solitaire-mode 'mode-class 'special) 92(put 'solitaire-mode 'mode-class 'special)
93 93
94(defun solitaire-mode () 94(defun solitaire-mode ()
95 "Major mode for playing solitaire. 95 "Major mode for playing Solitaire.
96To learn how to play solitaire, see the documentation for function 96To learn how to play Solitaire, see the documentation for function
97`solitaire'. 97`solitaire'.
98\\<solitaire-mode-map> 98\\<solitaire-mode-map>
99The usual mnemonic keys move the cursor around the board; in addition, 99The usual mnemonic keys move the cursor around the board; in addition,
@@ -102,6 +102,7 @@ The usual mnemonic keys move the cursor around the board; in addition,
102 (kill-all-local-variables) 102 (kill-all-local-variables)
103 (use-local-map solitaire-mode-map) 103 (use-local-map solitaire-mode-map)
104 (setq truncate-lines t) 104 (setq truncate-lines t)
105 (setq show-trailing-whitespace nil)
105 (setq major-mode 'solitaire-mode) 106 (setq major-mode 'solitaire-mode)
106 (setq mode-name "Solitaire") 107 (setq mode-name "Solitaire")
107 (run-mode-hooks 'solitaire-mode-hook)) 108 (run-mode-hooks 'solitaire-mode-hook))
@@ -145,7 +146,7 @@ Move stones using \\[solitaire-move] followed by a direction key.
145Undo moves using \\[solitaire-undo]. 146Undo moves using \\[solitaire-undo].
146Check for possible moves using \\[solitaire-do-check]. 147Check for possible moves using \\[solitaire-do-check].
147\(The variable `solitaire-auto-eval' controls whether to automatically 148\(The variable `solitaire-auto-eval' controls whether to automatically
148check after each move or undo) 149check after each move or undo.)
149 150
150What is Solitaire? 151What is Solitaire?
151 152
@@ -426,7 +427,7 @@ Seen in info on text lines."
426 427
427;; And here's the spoiler:) 428;; And here's the spoiler:)
428(defun solitaire-solve () 429(defun solitaire-solve ()
429 "Spoil solitaire by solving the game for you - nearly ... 430 "Spoil Solitaire by solving the game for you - nearly ...
430... stops with five stones left ;)" 431... stops with five stones left ;)"
431 (interactive) 432 (interactive)
432 (let ((allmoves [up up S-down up left left S-right up up left S-down 433 (let ((allmoves [up up S-down up left left S-right up up left S-down