# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: daniel.dehennin@baby-gnu.org-20090127184428-\ # g31ccthfaksykt29 # target_branch: ../../gnus.head # testament_sha1: c1cf3a01375bb35cd7bde5fa3102662608096e6a # timestamp: 2009-01-28 11:48:57 +0100 # source_branch: . # base_revision_id: daniel.dehennin@baby-gnu.org-20090126152327-\ # ccpvwbbxys1zto9f # # Begin patch === modified file 'lisp/mml2015.el' --- lisp/mml2015.el 2009-01-22 07:02:15 +0000 +++ lisp/mml2015.el 2009-01-27 18:44:28 +0000 @@ -1182,6 +1182,7 @@ (let* ((inhibit-redisplay t) (context (epg-make-context)) (boundary (mml-compute-boundary cont)) + (sender (message-options-get 'message-sender)) signer-key (signers (or (message-options-get 'mml2015-epg-signers) @@ -1191,8 +1192,8 @@ (epa-select-keys context "\ Select keys for signing. If no one is selected, default secret key is used. " - mml2015-signers t) - (if mml2015-signers + sender t) + (if sender (delq nil (mapcar (lambda (signer) @@ -1206,7 +1207,7 @@ signer))) (error "No secret key for %s" signer)) signer-key) - mml2015-signers))))))) + (list sender)))))))) signature micalg) (epg-context-set-armor context t) (epg-context-set-textmode context t)