(mml-signencrypt-style-alist): Use "combined" by default. Improve docstring.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9544017..d4ac5eb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-10  Simon Josefsson  <jas@extundo.com>
+
+       * mml-sec.el (mml-signencrypt-style-alist): Use "combined" by
+       default.  Improve docstring.
+
 2003-07-10  Kai Gro\e,A_\e(Bjohann  <kai.grossjohann@gmx.net>
 
        * imap.el (imap-arrival-filter): Fix test for missing process

diff --git a/lisp/mml-sec.el b/lisp/mml-sec.el
index c18cf2f..4a9e6e3 100644 (file)
--- a/lisp/mml-sec.el
+++ b/lisp/mml-sec.el
@@ -54,18 +54,21 @@
   "Default encryption method.")
 
 (defcustom mml-signencrypt-style-alist
-  '(("smime"   separate)
-    ("pgp"     separate)
-    ("pgpauto" separate)
-    ("pgpmime" separate))
+  '(("smime"   combined)
+    ("pgp"     combined)
+    ("pgpauto" combined)
+    ("pgpmime" combined))
   "Alist specifying if `signencrypt' results in two separate operations or not.
 The first entry indicates the MML security type, valid entries include
 the strings \"smime\", \"pgp\", and \"pgpmime\".  The second entry is
 a symbol `separate' or `combined' where `separate' means that MML signs
 and encrypt messages in a two step process, and `combined' means that MML
 signs and encrypt the message in one step.
-Note that the `combined' mode is NOT supported by all OpenPGP implementations,
-in particular PGP version 2 does not support it!"
+
+Note that the output generated by using a `combined' mode is NOT
+understood by all PGP implementations, in particular PGP version
+2 does not support it!  See Info node `(message)Security' for
+details."
   :type '(repeat (list (choice (const :tag "S/MIME" "smime")
                               (const :tag "PGP" "pgp")
                               (const :tag "PGP/MIME" "pgpmime")