Auto-commit of loaddefs files.

[gnu-emacs] / lisp / savehist.el

diff --git a/lisp/savehist.el b/lisp/savehist.el
index 6310190b4fe8bb834a4331c90d4dcf8d5b1c3233..cca958ff0a167e834a20ecd337393ed132f074b5 100644 (file)
--- a/lisp/savehist.el
+++ b/lisp/savehist.el
@@ -209,6 +209,7 @@ histories, which is probably undesirable."
 If `savehist-file' is in the old format that doesn't record
 the value of `savehist-minibuffer-history-variables', that
 value is deducted from the contents of the file."
+  (declare (obsolete savehist-mode "22.1"))
   (savehist-mode 1)
   ;; Old versions of savehist distributed with XEmacs didn't save
   ;; savehist-minibuffer-history-variables.  If that variable is nil
@@ -225,7 +226,6 @@ value is deducted from the contents of the file."
                ;; Collect VAR, i.e. (nth form 1).
                 (push (nth 1 form) vars))
               vars)))))
-(make-obsolete 'savehist-load 'savehist-mode "22.1")
 
 (defun savehist-install ()
   "Hook savehist into Emacs.
@@ -278,9 +278,9 @@ If AUTO-SAVE is non-nil, compare the saved contents to the one last saved,
          (print-level nil)
          (print-readably t)
          (print-quoted t))
-      ;; During the 24.2 development, read-passwd had a bug which resulted in
+      ;; During the 24.3 development, read-passwd had a bug which resulted in
       ;; the passwords being saved by savehist.  Trim them, retroactively.
-      ;; This code can be removed after the 24.2 release.
+      ;; This code can be removed after the 24.3 release.
       (dolist (sym savehist-minibuffer-history-variables)
         (if (and (symbolp sym) (equal (symbol-name sym) "forget-history"))
             (setq savehist-minibuffer-history-variables