Mercurial > emacs
diff lisp/gnus/mml2015.el @ 93386:a789a1138b08
Merge from gnus--devo--0
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1104
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sat, 29 Mar 2008 19:54:11 +0000 |
| parents | d3767aa9ae49 |
| children | 1e3a407766b9 |
line wrap: on
line diff
--- a/lisp/gnus/mml2015.el Sat Mar 29 15:28:57 2008 +0000 +++ b/lisp/gnus/mml2015.el Sat Mar 29 19:54:11 2008 +0000 @@ -999,7 +999,11 @@ (defun mml2015-epg-passphrase-callback (context key-id ignore) (if (eq key-id 'SYM) (epg-passphrase-callback-function context key-id nil) - (let* (entry + (let* ((password-cache-key-id + (if (eq key-id 'PIN) + "PIN" + key-id)) + entry (passphrase (password-read (if (eq key-id 'PIN) @@ -1007,14 +1011,12 @@ (if (setq entry (assoc key-id epg-user-id-alist)) (format "Passphrase for %s %s: " key-id (cdr entry)) (format "Passphrase for %s: " key-id))) - (if (eq key-id 'PIN) - "PIN" - key-id)))) + password-cache-key-id))) (when passphrase (let ((password-cache-expiry mml2015-passphrase-cache-expiry)) - (password-cache-add key-id passphrase)) + (password-cache-add password-cache-key-id passphrase)) (setq mml2015-epg-secret-key-id-list - (cons key-id mml2015-epg-secret-key-id-list)) + (cons password-cache-key-id mml2015-epg-secret-key-id-list)) (copy-sequence passphrase))))) (defun mml2015-epg-find-usable-key (keys usage)