Mercurial > emacs
diff lisp/gnus/mml2015.el @ 105253:baa4e6ac9e46
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 Sjogren <asjo@koldfront.dk>
* spam.el (spam-unregister-on-reregister): Add boolean variable.
(spam-resolve-registrations-routine): Use it to unregister articles
that change status.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Mon, 28 Sep 2009 12:09:01 +0000 |
| parents | a9dc0e7c3f2b |
| children | 1d1d5d9bd884 |
line wrap: on
line diff
--- a/lisp/gnus/mml2015.el Mon Sep 28 12:02:53 2009 +0000 +++ b/lisp/gnus/mml2015.el Mon Sep 28 12:09:01 2009 +0000 @@ -1187,7 +1187,7 @@ (or (message-options-get 'mml2015-epg-signers) (message-options-set 'mml2015-epg-signers - (if mml2015-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. " @@ -1269,7 +1269,7 @@ (unless mml2015-signers (error "mml2015-signers not set")) (setq recipients (nconc recipients mml2015-signers))) - (if mml2015-verbose + (if (eq mm-encrypt-option 'guided) (setq recipients (epa-select-keys context "\ Select recipients for encryption. @@ -1297,7 +1297,7 @@ (or (message-options-get 'mml2015-epg-signers) (message-options-set 'mml2015-epg-signers - (if mml2015-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. "