* mml2015.el (mml2015-pgg-sign): Use mml-sender instead of

message-sender.
* mml.el (mml-generate-mime-1): Set mml-sender too.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cc431d8..9060488 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2003-04-29  Simon Josefsson  <jas@extundo.com>
+
+       * mml2015.el (mml2015-pgg-sign): Use mml-sender instead of
+       message-sender.
+
+       * mml.el (mml-generate-mime-1): Set mml-sender too.
+
 2003-04-29  Jesper Harder  <harder@ifa.au.dk>
 
        * gnus-sum.el (gnus-summary-display-while-building): Docstring fix.

diff --git a/lisp/mml.el b/lisp/mml.el
index 94f3712..77f49eb 100644 (file)
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -541,8 +541,9 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
                                 mml-encrypt-alist))
            sender recipients)
        (when (or sign-item encrypt-item)
-         (if (setq sender (cdr (assq 'sender cont)))
-             (message-options-set 'message-sender sender))
+         (when (setq sender (cdr (assq 'sender cont)))
+           (message-options-set 'mml-sender sender)
+           (message-options-set 'message-sender sender))
          (if (setq recipients (cdr (assq 'recipients cont)))
              (message-options-set 'message-recipients recipients))
          (let ((style (mml-signencrypt-style (first (or sign-item encrypt-item)))))

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 60c9e94..e3e3c5a 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -807,7 +807,7 @@
 (defun mml2015-pgg-sign (cont)
   (let ((pgg-errors-buffer mml2015-result-buffer)
        (boundary (funcall mml-boundary-function (incf mml-multipart-number)))
-       (pgg-default-user-id (or (message-options-get 'message-sender)
+       (pgg-default-user-id (or (message-options-get 'mml-sender)
                                 pgg-default-user-id)))
     (unless (pgg-sign-region (point-min) (point-max))
       (pop-to-buffer mml2015-result-buffer)