X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmml-sec.el;h=be4665b714063e3bfc2f735c8fa0860e9219d971;hb=249142f014344b6f7e1a85fdebc289fd45819a84;hp=0b1be32c2417b0e7cd96fc3efad85b23a1237229;hpb=88a2cbade926ab994768b63e407390a44762941c;p=elisp%2Fgnus.git-

diff --git a/lisp/mml-sec.el b/lisp/mml-sec.el
index 0b1be32..be4665b 100644
--- a/lisp/mml-sec.el
+++ b/lisp/mml-sec.el
@@ -1,8 +1,9 @@
 ;;; mml-sec.el --- A package with security functions for MML documents
-;; Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
-;; This file is not part of GNU Emacs, but the same permissions apply.
+
+;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -23,10 +24,14 @@
 
 ;;; Code:
 
-(require 'mml2015)
-(require 'mml1991)
 (require 'mml-smime)
 (eval-when-compile (require 'cl))
+(autoload 'mml2015-sign "mml2015")
+(autoload 'mml2015-encrypt "mml2015")
+(autoload 'mml1991-sign "mml1991")
+(autoload 'mml1991-encrypt "mml1991")
+(autoload 'message-goto-body "message")
+(autoload 'mml-insert-tag "mml")
 
 (defvar mml-sign-alist
   '(("smime"     mml-smime-sign-buffer     mml-smime-sign-query)
@@ -35,8 +40,15 @@
     ("pgpmime"   mml-pgpmime-sign-buffer   list))
   "Alist of MIME signer functions.")
 
-(defvar mml-default-sign-method (caar mml-sign-alist)
-  "Default sign method.")
+(defcustom mml-default-sign-method "pgpmime"
+  "Default sign method.
+The string must have an entry in `mml-sign-alist'."
+  :type '(choice (const "smime")
+		 (const "pgp")
+		 (const "pgpauto")
+		 (const "pgpmime")
+		 string)
+  :group 'message)
 
 (defvar mml-encrypt-alist
   '(("smime"     mml-smime-encrypt-buffer     mml-smime-encrypt-query)
@@ -45,29 +57,39 @@
     ("pgpmime"   mml-pgpmime-encrypt-buffer   list))
   "Alist of MIME encryption functions.")
 
-(defvar mml-default-encrypt-method (caar mml-encrypt-alist)
-  "Default encryption method.")
+(defcustom mml-default-encrypt-method "pgpmime"
+  "Default encryption method.
+The string must have an entry in `mml-encrypt-alist'."
+  :type '(choice (const "smime")
+		 (const "pgp")
+		 (const "pgpauto")
+		 (const "pgpmime")
+		 string)
+  :group 'message)
 
 (defcustom mml-signencrypt-style-alist
   '(("smime"   separate)
-    ("pgp"     separate)
-    ("pgpauto" separate)
-    ("pgpmime" separate))
+    ("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")
 			       (string :tag "User defined"))
 		       (choice (const :tag "Separate" separate)
 			       (const :tag "Combined" combined)))))
-			      
+
 ;;; Configuration/helper functions
 
 (defun mml-signencrypt-style (method &optional style)
@@ -90,7 +112,7 @@ You can also customize or set `mml-signencrypt-style-alist' instead."
 	    (setf (second style-item) style)
 	  ;; otherwise, just return the current value
 	  (second style-item))
-      (gnus-message 3 "Warning, attempt to set invalid signencrypt-style"))))
+      (message "Warning, attempt to set invalid signencrypt style"))))
 
 ;;; Security functions
 
@@ -219,7 +241,7 @@ You can also customize or set `mml-signencrypt-style-alist' instead."
   (save-excursion
     (goto-char (point-max))
     (when (re-search-backward "^<#secure.*>\n" nil t)
-      (kill-region (match-beginning 0) (match-end 0)))))
+      (delete-region (match-beginning 0) (match-end 0)))))
 
 (defun mml-secure-message-sign-smime ()
   "Add MML tag to encrypt/sign the entire message."