# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1218579810 0
# Node ID 9cdccb5e49a87be02ccaabafedb06e35da2cf50a
# Parent  0bd3bab4b7bebeb915c23d496afaad2a037ae65d
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.

diff -r 0bd3bab4b7be -r 9cdccb5e49a8 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Aug 12 18:36:15 2008 +0000
+++ b/lisp/ChangeLog	Tue Aug 12 22:23:30 2008 +0000
@@ -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 -r 0bd3bab4b7be -r 9cdccb5e49a8 lisp/desktop.el
--- a/lisp/desktop.el	Tue Aug 12 18:36:15 2008 +0000
+++ b/lisp/desktop.el	Tue Aug 12 22:23:30 2008 +0000
@@ -454,7 +454,8 @@
 (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 -r 0bd3bab4b7be -r 9cdccb5e49a8 lisp/play/solitaire.el
--- a/lisp/play/solitaire.el	Tue Aug 12 18:36:15 2008 +0000
+++ b/lisp/play/solitaire.el	Tue Aug 12 22:23:30 2008 +0000
@@ -431,6 +431,8 @@
   "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