diff options
| author | Miles Bader <miles@gnu.org> | 2006-09-05 08:17:35 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-09-05 08:17:35 +0000 |
| commit | 8fbdffe57a11cb95aa620a3a34b4bbe25219218d (patch) | |
| tree | 966a9817e5467826b59ac8b36f5eccbc2d4d6d95 /lisp/pgg.el | |
| parent | 652bf3a19f5b1c8b72a0053b4d8fcb7879054285 (diff) | |
| download | emacs-8fbdffe57a11cb95aa620a3a34b4bbe25219218d.tar.gz | |
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 131-133)
- Update from CVS
2006-09-05 Daiki Ueno <ueno@unixuser.org>
* lisp/pgg.el (pgg-clear-string): Alias to clear-string for backward
compatibility.
* lisp/pgg-gpg.el (pgg-gpg-process-region): Avoid display blinking with
inhibit-redisplay; encode passphrase with locale-coding-system.
2006-09-04 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-art.el (article-decode-encoded-words): Make it fast.
2006-09-04 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-art.el (article-decode-encoded-words): Don't infloop in XEmacs.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-424
Diffstat (limited to 'lisp/pgg.el')
| -rw-r--r-- | lisp/pgg.el | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/pgg.el b/lisp/pgg.el index 7a30dafce8d..e8a85b58fae 100644 --- a/lisp/pgg.el +++ b/lisp/pgg.el @@ -148,6 +148,11 @@ regulate cache behavior." #'pgg-remove-passphrase-from-cache key notruncate)))) +(if (fboundp 'clear-string) + (defalias 'pgg-clear-string 'clear-string) + (defun pgg-clear-string (string) + (fillarray string ?_))) + (defun pgg-remove-passphrase-from-cache (key &optional notruncate) "Omit passphrase associated with KEY in time-limited passphrase cache. @@ -166,7 +171,7 @@ regulate cache behavior." (interned-timer-key (intern-soft key pgg-pending-timers)) (old-timer (symbol-value interned-timer-key))) (when passphrase - (fillarray passphrase ?_) + (pgg-clear-string passphrase) (unintern key pgg-passphrase-cache)) (when old-timer (pgg-cancel-timer old-timer) |