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.
This commit is contained in:
Juanma Barranquero 2008-08-12 22:23:30 +00:00
parent d35a5141a5
commit 5ef52f40c5
3 changed files with 11 additions and 1 deletions

View file

@ -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.

View file

@ -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

View file

@ -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