[Emacs-diffs] /srv/bzr/emacs/trunk r102412: mml2015-epg-sign: Use From header.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 102412
author: Daniel Dehennin <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2010-11-16 23:05:02 +0000
message:
  mml2015-epg-sign: Use From header.
  
  mml2015.el (mml2015-epg-sign): New variable 'sender' is
   (message-options-get 'message-sender) and append it to mml2015-signers.
   If mm-sign-option is not 'guided, mml2015-signers and sender sign the mail.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/mml2015.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-11-16 00:04:25 +0000
+++ b/lisp/gnus/ChangeLog       2010-11-16 23:05:02 +0000
@@ -1,3 +1,7 @@
+2010-11-16  Daniel Dehennin  <address@hidden>
+
+       * mml2015.el (mml2015-epg-sign): Use From header.
+
 2010-11-15  Lars Magne Ingebrigtsen  <address@hidden>
 
        * gnus-html.el (gnus-html-wash-images): Register a displayer.

=== modified file 'lisp/gnus/mml2015.el'
--- a/lisp/gnus/mml2015.el      2010-10-11 23:29:33 +0000
+++ b/lisp/gnus/mml2015.el      2010-11-16 23:05:02 +0000
@@ -941,6 +941,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)
@@ -950,8 +951,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
+                                   (cons sender mml2015-signers) t)
+                (if (or sender mml2015-signers)
                     (delq nil
                           (mapcar
                            (lambda (signer)
@@ -965,7 +966,7 @@
                                            signer)))
                                (error "No secret key for %s" signer))
                              signer-key)
-                           mml2015-signers)))))))
+                           (cons sender mml2015-signers))))))))
         signature micalg)
     (epg-context-set-armor context t)
     (epg-context-set-textmode context t)
@@ -1008,6 +1009,7 @@
   (let ((inhibit-redisplay t)
        (context (epg-make-context))
        (config (epg-configuration))
+       (sender (message-options-get 'message-sender))
        (recipients (message-options-get 'mml2015-epg-recipients))
        cipher signers
        (boundary (mml-compute-boundary cont))
@@ -1025,9 +1027,9 @@
                                              (read-string "Recipients: ")))
                     "[ \f\t\n\r\v,]+"))))
       (when mml2015-encrypt-to-self
-       (unless mml2015-signers
-         (error "mml2015-signers not set"))
-       (setq recipients (nconc recipients mml2015-signers)))
+       (unless (or sender mml2015-signers)
+         (error "Message sender and mml2015-signers not set"))
+       (setq recipients (nconc recipients (cons sender mml2015-signers))))
       (if (eq mm-encrypt-option 'guided)
          (setq recipients
                (epa-select-keys context "\
@@ -1060,8 +1062,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
+                                     (cons mml2015-signers) t)
+                  (if (or sender mml2015-signers)
                       (delq nil
                             (mapcar
                              (lambda (signer)
@@ -1075,7 +1077,7 @@
                                              signer)))
                                  (error "No secret key for %s" signer))
                                signer-key)
-                             mml2015-signers)))))))
+                             (cons mml2015-signers))))))))
       (epg-context-set-signers context signers))
     (epg-context-set-armor context t)
     (epg-context-set-textmode context t)