diff options
| author | Gnus developers <ding@gnus.org> | 2011-01-27 23:42:38 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2011-01-27 23:42:38 +0000 |
| commit | 19cc66979d336c0b62cf770ecb5863a86cfd510e (patch) | |
| tree | 148a3f6d63e4f10bb46bc2c03b2c9913e24a5b27 /lisp/gnus/mml2015.el | |
| parent | b1ab31aeec46fdd1c9f69a54b58800539b15b289 (diff) | |
| download | emacs-19cc66979d336c0b62cf770ecb5863a86cfd510e.tar.gz | |
Merge changes made in Gnus trunk.
mml2015.el (mml2015-epg-sign): Add and use mml2015-sign-with-sender.
(mml2015-epg-encrypt): Use mml2015-sign-with-sender.
gnus-art.el (article-update-date-lapsed): Ensure that point stays at the "same place" even if point is on the line being replaced.
(article-update-date-lapsed): Allow updating both the combined lapsed and the lapsed headers.
(article-update-date-lapsed): Skip past all the X-Sent/Date headers.
(article-make-date-line): Limit the number of segments dynamically to avoid too-long lines.
Diffstat (limited to 'lisp/gnus/mml2015.el')
| -rw-r--r-- | lisp/gnus/mml2015.el | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el index 0ac6208d9d9..eb01c924c2d 100644 --- a/lisp/gnus/mml2015.el +++ b/lisp/gnus/mml2015.el @@ -120,6 +120,12 @@ Whether the passphrase is cached at all is controlled by :group 'mime-security :type '(repeat (string :tag "Key ID"))) +(defcustom mml2015-sign-with-sender nil + "If t, use message sender so find a key to sign with." + :group 'mime-security + :type 'boolean + :version "24.1") + (defcustom mml2015-encrypt-to-self nil "If t, add your own key ID to recipient list when encryption." :group 'mime-security @@ -959,7 +965,8 @@ Whether the passphrase is cached at all is controlled by (let* ((inhibit-redisplay t) (context (epg-make-context)) (boundary (mml-compute-boundary cont)) - (sender (message-options-get 'message-sender)) + (sender (when mml2015-sign-with-sender + message-options-get 'message-sender)) signer-key (signers (or (message-options-get 'mml2015-epg-signers) @@ -1034,7 +1041,8 @@ If no one is selected, default secret key is used. " (let ((inhibit-redisplay t) (context (epg-make-context)) (config (epg-configuration)) - (sender (message-options-get 'message-sender)) + (sender (when mml2015-sign-with-sender + (message-options-get 'message-sender))) (recipients (message-options-get 'mml2015-epg-recipients)) cipher signers (boundary (mml-compute-boundary cont)) |