* mml.el (mml-parse-1): Support sender in #secure tags.

* mml1991.el (mml1991-pgg-sign): Only use message-sender if it is
defined.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e0e149e..71a43c3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2002-10-10  Simon Josefsson  <jas@extundo.com>
 
+       * mml.el (mml-parse-1): Support sender in #secure tags.
+
+       * mml1991.el (mml1991-pgg-sign): Only use message-sender if it is
+       defined.
+
        * mml-sec.el (mml-smime-encrypt-buffer): Warn about combined signing.
        (mml-pgp-encrypt-buffer): Support combined signing.
 

diff --git a/lisp/mml.el b/lisp/mml.el
index 2bc78bf..55666e5 100644 (file)
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -151,6 +151,7 @@ one charsets.")
        (let* (secure-mode
               (taginfo (mml-read-tag))
               (recipients (cdr (assq 'recipients taginfo)))
+              (sender (cdr (assq 'sender taginfo)))
               (location (cdr (assq 'tag-location taginfo)))
               (mode (cdr (assq 'mode taginfo)))
               (method (cdr (assq 'method taginfo)))
@@ -174,7 +175,9 @@ one charsets.")
          (eval `(mml-insert-tag ,secure-mode
                                 ,@tags
                                 ,(if recipients "recipients")
-                                ,recipients))
+                                ,recipients
+                                ,(if sender "sender")
+                                ,sender))
          ;; restart the parse
          (goto-char location)))
        ((looking-at "<#multipart")

diff --git a/lisp/mml1991.el b/lisp/mml1991.el
index 171264f..ea2679e 100644 (file)
--- a/lisp/mml1991.el
+++ b/lisp/mml1991.el
@@ -24,7 +24,7 @@
 
 ;;; Commentary:
 
-;; RCS: $Id: mml1991.el,v 6.12 2002/10/09 22:43:59 jas Exp $
+;; RCS: $Id: mml1991.el,v 6.13 2002/10/09 23:27:32 jas Exp $
 
 ;;; Code:
 
@@ -232,7 +232,9 @@
       (forward-line) ;; skip header/body separator
       (kill-region (point-min) (point)))
     (quoted-printable-decode-region (point-min) (point-max))
-    (unless (let ((pgg-default-user-id (message-options-get 'message-sender)))
+    (unless (let ((pgg-default-user-id
+                  (or (message-options-get 'message-sender)
+                      pgg-default-user-id)))
              (pgg-sign-region (point-min) (point-max) t))
       (pop-to-buffer pgg-errors-buffer)
       (error "Encrypt error"))