From 8fbdffe57a11cb95aa620a3a34b4bbe25219218d Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Tue, 5 Sep 2006 08:17:35 +0000 Subject: Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 131-133) - Update from CVS 2006-09-05 Daiki Ueno * 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 * lisp/gnus/gnus-art.el (article-decode-encoded-words): Make it fast. 2006-09-04 Katsumi Yamaoka * lisp/gnus/gnus-art.el (article-decode-encoded-words): Don't infloop in XEmacs. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-424 --- lisp/pgg.el | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'lisp/pgg.el') 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) -- cgit v1.2.3