X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/5725bd2cc0e691dadc31bd958f210b1bbcf17c49..9a84bfd6813ca38b8402e4368dcc76e857716cd9:/lisp/savehist.el

diff --git a/lisp/savehist.el b/lisp/savehist.el
index 6310190b4f..14085e5e57 100644
--- a/lisp/savehist.el
+++ b/lisp/savehist.el
@@ -1,9 +1,9 @@
 ;;; savehist.el --- Save minibuffer history
 
-;; Copyright (C) 1997, 2005-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2005-2014 Free Software Foundation, Inc.
 
 ;; Author: Hrvoje Niksic <hniksic@xemacs.org>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: minibuffer
 ;; Version: 24
 
@@ -49,7 +49,7 @@
 
 (require 'custom)
 (eval-when-compile
-  (require 'cl))
+  (if (featurep 'xemacs) (require 'cl)))
 
 ;; User variables
 
@@ -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