2002-01-22 Josh Huber <huber@alum.wpi.edu>

	* emacs-mime.texi (MML Definition): Added a few words about the
	recipients option.
	* message.texi (Security): Changed documentation to reflect use of
	the new secure tag.

2002-01-22  Josh Huber  <huber@alum.wpi.edu>

	* mml.el (mml-parse-1): Fixed usage of recipients in the secure
	tag.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 17a5f46..2abdfe5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-22  Josh Huber  <huber@alum.wpi.edu>
+
+       * mml.el (mml-parse-1): Fixed usage of recipients in the secure
+       tag.
+
 2002-01-22  Josh Huber  <huber@alum.wpi.edu>
 
        * message.el (message-font-lock-keywords): Added the secure tag.

diff --git a/lisp/mml.el b/lisp/mml.el
index 02e1d8c..bd74610 100644 (file)
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -150,7 +150,7 @@ one charsets.")
        ;; included in the message
        (let* (secure-mode
               (taginfo (mml-read-tag))
-              (recipient (cdr (assq 'recipient taginfo)))
+              (recipients (cdr (assq 'recipients taginfo)))
               (location (cdr (assq 'tag-location taginfo))))
          (save-excursion
            (if
@@ -165,8 +165,8 @@ one charsets.")
          (mml-insert-tag secure-mode
                          (cdr (assq 'mode taginfo))
                          (cdr (assq 'method taginfo))
-                         (and recipient 'recipient)
-                         recipient)
+                         (and recipients 'recipients)
+                         recipients)
          ;; restart the parse
          (goto-char location)))
        ((looking-at "<#multipart")

diff --git a/texi/ChangeLog b/texi/ChangeLog
index af06cf2..363dcac 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,10 @@
+2002-01-22  Josh Huber  <huber@alum.wpi.edu>
+
+       * emacs-mime.texi (MML Definition): Added a few words about the
+       recipients option.
+       * message.texi (Security): Changed documentation to reflect use of
+       the new secure tag.
+
 2002-01-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus.texi (Article Washing): Addition.

diff --git a/texi/emacs-mime.texi b/texi/emacs-mime.texi
index 12a4862..0c043ba 100644 (file)
--- a/texi/emacs-mime.texi
+++ b/texi/emacs-mime.texi
@@ -1216,6 +1216,10 @@ RFC822 date when the part was modified (@code{Content-Disposition}).
 @item read-date
 RFC822 date when the part was read (@code{Content-Disposition}).
 
+@item recipients
+Who to encrypt/sign the part to.  This field is used to override any
+auto-detection based on the To/CC headers.
+
 @item size
 The size (in octets) of the part (@code{Content-Disposition}).
 

diff --git a/texi/message.texi b/texi/message.texi
index 0429152..b3dce42 100644 (file)
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -663,6 +663,7 @@ Manual}).
 @cindex PGP/MIME
 @cindex sign
 @cindex encrypt
+@cindex secure
 
 Using the MML language, Message is able to create digitally signed and
 digitally encrypted messages.  Message (or rather MML) currently
@@ -675,47 +676,53 @@ c} key map for encryption, as follows.
 
 @item C-c C-m s s
 @kindex C-c C-m s s
-@findex mml-secure-sign-smime
+@findex mml-secure-message-sign-smime
 
-Digitally sign current MIME part using S/MIME.
+Digitally sign current message using S/MIME.
 
 @item C-c C-m s o
 @kindex C-c C-m s o
-@findex mml-secure-sign-pgp
+@findex mml-secure-message-sign-pgp
 
-Digitally sign current MIME part using PGP.
+Digitally sign current message using PGP.
 
 @item C-c C-m s p
 @kindex C-c C-m s p
-@findex mml-secure-sign-pgp
+@findex mml-secure-message-sign-pgp
 
-Digitally sign current MIME part using PGP/MIME.
+Digitally sign current message using PGP/MIME.
 
 @item C-c C-m c s
 @kindex C-c C-m c s
-@findex mml-secure-encrypt-smime
+@findex mml-secure-message-encrypt-smime
 
-Digitally encrypt current MIME part using S/MIME.
+Digitally encrypt current message using S/MIME.
 
 @item C-c C-m c o
 @kindex C-c C-m c o
-@findex mml-secure-encrypt-pgp
+@findex mml-secure-message-encrypt-pgp
 
-Digitally encrypt current MIME part using PGP.
+Digitally encrypt current message using PGP.
 
 @item C-c C-m c p
 @kindex C-c C-m c p
-@findex mml-secure-encrypt-pgpmime
+@findex mml-secure-message-encrypt-pgpmime
 
-Digitally encrypt current MIME part using PGP/MIME.
+Digitally encrypt current message using PGP/MIME.
 
 @end table
 
 These commands do not immediately sign or encrypt the message, they
-merely insert proper MML tags to instruct the MML engine to perform that
-operation when the message is actually sent.  They may perform other
-operations too, such as locating and retrieving a S/MIME certificate of
-the person you wish to send encrypted mail to.
+merely insert the proper MML secure tag to instruct the MML engine to
+perform that operation when the message is actually sent. They may
+perform other operations too, such as locating and retrieving a S/MIME
+certificate of the person you wish to send encrypted mail to.  When the
+mml parsing engine converts your MML into a properly encoded MIME
+message, the secure tag will be replaced with either a part or a
+multipart tag.  If your message contains other mml parts, a multipart
+tag will be used; if no other parts are present in your message a single
+part tag will be used.  This way, message mode will do the Right Thing
+(TM) with signed/encrypted multipart messages.
 
 Since signing and especially encryption often is used when sensitive
 information is sent, you may want to have some way to ensure that your