Synch to Gnus 200307310116.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9fa2364..63f2868 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-31  Simon Josefsson  <jas@extundo.com>
+
+       * mml-sec.el (mml-signencrypt-style-alist): Use separate S/MIME
+       method by default (revert partial 2003-07-10 patch).
+
 2003-07-28  Dave Love  <fx@gnu.org>
 
        * pgg-gpg.el, pgg-pgp.el, pgg-pgp5.el: Require cl when compiling.

diff --git a/lisp/mml-sec.el b/lisp/mml-sec.el
index 4a9e6e3..757a0f8 100644 (file)
--- a/lisp/mml-sec.el
+++ b/lisp/mml-sec.el
@@ -54,7 +54,7 @@
   "Default encryption method.")
 
 (defcustom mml-signencrypt-style-alist
-  '(("smime"   combined)
+  '(("smime"   separate)
     ("pgp"     combined)
     ("pgpauto" combined)
     ("pgpmime" combined))