[Emacs-diffs] trunk r116979: * savehist.el (savehist-save): Remove workaround for a read-passwd

[Karl Fogel]

------------------------------------------------------------
revno: 116979
revision-id: address@hidden
parent: address@hidden
committer: Karl Fogel <address@hidden>
branch nick: trunk
timestamp: Wed 2014-04-16 14:46:36 +0800
message:
  * savehist.el (savehist-save): Remove workaround for a read-passwd
  bug that was fixed before 24.3.  Thanks to Juanma Barranquero for
  noticing that the shim was still present.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/savehist.el               
savehist.el-20091113204419-o5vbwnq5f7feedwu-3943

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-04-14 21:01:37 +0000
+++ b/lisp/ChangeLog    2014-04-16 06:46:36 +0000
@@ -1,3 +1,9 @@
+2014-04-16  Karl Fogel  <address@hidden>
+
+       * savehist.el (savehist-save): Remove workaround for a read-passwd
+       bug that was fixed before 24.3.  Thanks to Juanma Barranquero for
+       noticing that the shim was still present.
+
 2014-04-14  Stefan Monnier  <address@hidden>
 
        * doc-view.el (doc-view-set-doc-type): Ignore file name case; add .pps.
@@ -125,6 +131,7 @@
        * subr.el (with-silent-modifications): Don't bind deactivate-mark,
        buffer-file-name, and buffer-file-truename any more.
 
+>>>>>>> MERGE-SOURCE
 2014-04-08  Leo Liu  <address@hidden>
 
        Use lexical-binding and require cl-lib.

=== modified file 'lisp/savehist.el'
--- a/lisp/savehist.el  2014-02-21 00:47:17 +0000
+++ b/lisp/savehist.el  2014-04-16 06:46:36 +0000
@@ -278,13 +278,6 @@
          (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