ibuffer-copy-filename-as-kill verbosity increase

[gnu-emacs] / lisp / savehist.el

diff --git a/lisp/savehist.el b/lisp/savehist.el
index 00dac4b578a1d3126478737f2410ebde55e213d1..e700a172f1ca7e0410e94329ce2d19ea0befb88e 100644 (file)
--- a/lisp/savehist.el
+++ b/lisp/savehist.el
@@ -1,6 +1,6 @@
 ;;; savehist.el --- Save minibuffer history
 
-;; Copyright (C) 1997, 2005-2015 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2005-2016 Free Software Foundation, Inc.
 
 ;; Author: Hrvoje Niksic <hniksic@xemacs.org>
 ;; Maintainer: emacs-devel@gnu.org
@@ -270,21 +270,18 @@ If AUTO-SAVE is non-nil, compare the saved contents to the one last saved,
   (interactive)
   (with-temp-buffer
     (insert
-     (format ";; -*- mode: emacs-lisp; coding: %s -*-\n" savehist-coding-system)
-     ";; Minibuffer history file, automatically generated by `savehist'.\n\n")
+     (format-message
+      (concat
+       ";; -*- mode: emacs-lisp; coding: %s -*-\n"
+       ";; Minibuffer history file, automatically generated by `savehist'.\n"
+       "\n")
+      savehist-coding-system))
     (run-hooks 'savehist-save-hook)
     (let ((print-length nil)
          (print-string-length nil)
          (print-level nil)
          (print-readably t)
          (print-quoted t))
-      ;; 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.3 release.
-      (dolist (sym savehist-minibuffer-history-variables)
-        (if (and (symbolp sym) (equal (symbol-name sym) "forget-history"))
-            (setq savehist-minibuffer-history-variables
-                  (delq sym savehist-minibuffer-history-variables))))
       ;; Save the minibuffer histories, along with the value of
       ;; savehist-minibuffer-history-variables itself.
       (when savehist-save-minibuffer-history