diff options
author | Katsumi Yamaoka <yamaoka@jpl.org> | 2009-09-28 12:09:01 +0000 |
---|---|---|
committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2009-09-28 12:09:01 +0000 |
commit | 54c72c310894099a143af23937997d60ec58ebbe (patch) | |
tree | 1abb96d640e8929236c1aa98355689dbe0d58849 /lisp/gnus/mml-smime.el | |
parent | eefbedb1de1b16407079587893e77733d766c341 (diff) | |
download | emacs-54c72c310894099a143af23937997d60ec58ebbe.tar.gz |
Synch with Gnus trunk.
2009-09-22 Daiki Ueno <ueno@unixuser.org>
* mm-encode.el (mm-sign-option, mm-encrypt-option): New user option.
* mml2015.el (mml2015-epg-sign, mml2015-epg-encrypt): Let users select
keys from the menu if mm-{sign,encrypt}-option is 'guided.
* mml-smime.el (mml-smime-epg-sign, mml-smime-epg-encrypt): Ditto.
* mml1991.el (mml1991-epg-sign, mml1991-epg-encrypt): Ditto.
2009-09-15 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-art.el (gnus-article-edit-part): Work for the buffer
configuration that provides the sole article window in a frame;
position point correctly after deleting a part.
2009-09-14 Adam Sjøgren <asjo@koldfront.dk>
* spam.el (spam-unregister-on-reregister): Add boolean variable.
(spam-resolve-registrations-routine): Use it to unregister articles
that change status.
Diffstat (limited to 'lisp/gnus/mml-smime.el')
-rw-r--r-- | lisp/gnus/mml-smime.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/gnus/mml-smime.el b/lisp/gnus/mml-smime.el index af4d1bf9363..8aeb56413f9 100644 --- a/lisp/gnus/mml-smime.el +++ b/lisp/gnus/mml-smime.el @@ -381,7 +381,7 @@ Whether the passphrase is cached at all is controlled by (or (message-options-get 'mml-smime-epg-signers) (message-options-set 'mml-smime-epg-signers - (if mml-smime-verbose + (if (eq mm-sign-option 'guided) (epa-select-keys context "\ Select keys for signing. If no one is selected, default secret key is used. " @@ -462,7 +462,7 @@ Content-Disposition: attachment; filename=smime.p7s (message-options-set 'message-recipients (read-string "Recipients: "))) "[ \f\t\n\r\v,]+")))) - (if mml-smime-verbose + (if (eq mm-encrypt-option 'guided) (setq recipients (epa-select-keys context "\ Select recipients for encryption. |