diff options
| author | Karl Fogel <kfogel@red-bean.com> | 2014-04-16 14:46:36 +0800 |
|---|---|---|
| committer | Karl Fogel <kfogel@red-bean.com> | 2014-04-16 14:46:36 +0800 |
| commit | 5f6b41547797de0997f2e757040c0f7e7dc35852 (patch) | |
| tree | b1298dd33fc71431b682ed6bfcf372852d0a5066 | |
| parent | 07abb6e4c13a7246b74cfc5b77d46495dcfaefd4 (diff) | |
| download | emacs-5f6b41547797de0997f2e757040c0f7e7dc35852.tar.gz emacs-5f6b41547797de0997f2e757040c0f7e7dc35852.tar.bz2 emacs-5f6b41547797de0997f2e757040c0f7e7dc35852.zip | |
* 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.
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/savehist.el | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f60e8652d92..735b1c56c31 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2014-04-16 Karl Fogel <kfogel@red-bean.com> + + * 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 <monnier@iro.umontreal.ca> * 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 <sdl.web@gmail.com> Use lexical-binding and require cl-lib. diff --git a/lisp/savehist.el b/lisp/savehist.el index 6abc29cccc2..26e9d0b881d 100644 --- a/lisp/savehist.el +++ b/lisp/savehist.el @@ -278,13 +278,6 @@ 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.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 |