summaryrefslogtreecommitdiff
path: root/lisp/savehist.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2012-06-22 13:30:25 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2012-06-22 13:30:25 -0400
commitac77b21adbddfd143449ef00be15df52f2ede924 (patch)
tree489dce1343c57e97873abfbb9692239474c6bf38 /lisp/savehist.el
parent057306483c1c7a9216276c51946406c422d60b70 (diff)
downloademacs-ac77b21adbddfd143449ef00be15df52f2ede924.tar.gz
* lisp/subr.el (read-passwd): Don't use a history at all.
* lisp/savehist.el (savehist-save): Remove password saved accidentally because of the above bug.
Diffstat (limited to 'lisp/savehist.el')
-rw-r--r--lisp/savehist.el7
1 files changed, 7 insertions, 0 deletions
diff --git a/lisp/savehist.el b/lisp/savehist.el
index a65906a1676..6310190b4fe 100644
--- a/lisp/savehist.el
+++ b/lisp/savehist.el
@@ -278,6 +278,13 @@ 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
+ ;; the passwords being saved by savehist. Trim them, retroactively.
+ ;; This code can be removed after the 24.2 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