diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2008-08-12 22:23:30 +0000 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2008-08-12 22:23:30 +0000 |
| commit | 5ef52f40c528f519687623bea400ab0dd00e6422 (patch) | |
| tree | 62114e02623344b50cb928c919159838d4ebde4f | |
| parent | d35a5141a520f29b29ba5e5e7f1f2e339a719b5d (diff) | |
| download | emacs-5ef52f40c528f519687623bea400ab0dd00e6422.tar.gz | |
Backport trivial fixes from the trunk.
* desktop.el (desktop-minor-mode-table): Add `savehist-mode'.
* play/solitaire.el (solitaire-solve): Err out if the solitaire
is already in progress.
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/desktop.el | 3 | ||||
| -rw-r--r-- | lisp/play/solitaire.el | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 41d2b1902a3..8e4f7bb0f21 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2008-08-12 Juanma Barranquero <lekktu@gmail.com> + + * desktop.el (desktop-minor-mode-table): Add `savehist-mode'. + + * play/solitaire.el (solitaire-solve): Err out if the solitaire + is already in progress. + 2008-08-12 NAKAGAWA Makoto <gha03025@nifty.ne.jp> (tiny change) * net/ldap.el (ldap-search-internal): Tweak URL regexp. diff --git a/lisp/desktop.el b/lisp/desktop.el index a042828e19c..2bee425e7c2 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -454,7 +454,8 @@ Furthermore the major mode function must be autoloaded.") (defcustom desktop-minor-mode-table '((auto-fill-function auto-fill-mode) (vc-mode nil) - (vc-dired-mode nil)) + (vc-dired-mode nil) + (savehist-mode nil)) "Table mapping minor mode variables to minor mode functions. Each entry has the form (NAME RESTORE-FUNCTION). NAME is the name of the buffer-local variable indicating that the minor diff --git a/lisp/play/solitaire.el b/lisp/play/solitaire.el index 243d9525ce4..3532d47e32c 100644 --- a/lisp/play/solitaire.el +++ b/lisp/play/solitaire.el @@ -431,6 +431,8 @@ Seen in info on text lines." "Spoil solitaire by solving the game for you - nearly ... ... stops with five stones left ;)" (interactive) + (when (< solitaire-stones 32) + (error "Cannot solve game in progress")) (let ((allmoves [up up S-down up left left S-right up up left S-down up up right right S-left down down down S-up up S-down down down down S-up left left down |