2 files changed, 10 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f18fc1c1ae6..1354d31c95b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-28  Juanma Barranquero  <lekktu@gmail.com>
+
+        * desktop.el (desktop-minor-mode-table): Add `savehist-mode'.
+
 2008-04-27  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * vc.el (vc-dir-mode-map): Change bindings for unmark all and revert.
@@ -515,8 +519,8 @@
 
 2008-04-24  Michael Albinus  <michael.albinus@gmx.de>
 
-        * net/tramp.el (tramp-get-remote-stat): Test whether stat supports
-        %s.  Reported by Loris Bennett <loris.bennett@fu-berlin.de>.
+        * net/tramp.el (tramp-get-remote-stat): Test whether stat supports %s.
+        Reported by Loris Bennett <loris.bennett@fu-berlin.de>.
 
 2008-04-24  Sam Steingold  <sds@gnu.org>
 
@@ -2697,7 +2701,7 @@
         (hilit-chg-set-face-on-change, hilit-chg-update)
         (highlight-changes-rotate-faces): Use highlight-changes-visible-mode
         variable instead of testing highlight-changes-mode.
-        (highlight-markup-buffers): Add reuire ediff-util; argument on calls
+        (highlight-markup-buffers): Add require ediff-util; argument on calls
         to highlight-changes-mode changed.
         (highlight-compare-with-file): Fix problems with interactive
         call giving invalid default file.
diff --git a/lisp/desktop.el b/lisp/desktop.el
index b126925c467..7aa360cc479 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -84,7 +84,7 @@
 ;;    (add-to-list 'desktop-minor-mode-handlers
 ;;                 '(bar-mode . bar-desktop-restore))
 
-;; in the module itself, and make shure that the mode function is
+;; in the module itself, and make sure that the mode function is
 ;; autoloaded.  See the docstrings of `desktop-buffer-mode-handlers' and
 ;; `desktop-minor-mode-handlers' for more info.
 
@@ -456,7 +456,8 @@ Furthermore the major mode function must be autoloaded.")
   '((auto-fill-function auto-fill-mode)
     (vc-mode nil)
     (vc-dired-mode nil)
-    (erc-track-minor-mode nil))
+    (erc-track-minor-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