From 99b4055ce07d1abb3dd6476b84645acac7f67604 Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Thu, 10 Jul 2003 15:27:29 +0000 Subject: [PATCH] (mml-signencrypt-style-alist): Use "combined" by default. Improve docstring. --- lisp/ChangeLog | 5 +++++ lisp/mml-sec.el | 15 +++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9544017e2..d4ac5eb42 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2003-07-10 Simon Josefsson + + * mml-sec.el (mml-signencrypt-style-alist): Use "combined" by + default. Improve docstring. + 2003-07-10 Kai Gro,A_(Bjohann * imap.el (imap-arrival-filter): Fix test for missing process diff --git a/lisp/mml-sec.el b/lisp/mml-sec.el index c18cf2f35..4a9e6e366 100644 --- 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") -- 2.25.1