lisp/ChangeLog addition:

[gnus] / lisp / mml-sec.el

diff --git a/lisp/mml-sec.el b/lisp/mml-sec.el
index c1a494b..e716f62 100644 (file)
--- a/lisp/mml-sec.el
+++ b/lisp/mml-sec.el
@@ -1,5 +1,7 @@
 ;;; mml-sec.el --- A package with security functions for MML documents
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 
@@ -17,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -43,6 +45,7 @@
 (defcustom mml-default-sign-method "pgpmime"
   "Default sign method.
 The string must have an entry in `mml-sign-alist'."
+  :version "22.1"
   :type '(choice (const "smime")
                 (const "pgp")
                 (const "pgpauto")
@@ -60,6 +63,7 @@ The string must have an entry in `mml-sign-alist'."
 (defcustom mml-default-encrypt-method "pgpmime"
   "Default encryption method.
 The string must have an entry in `mml-encrypt-alist'."
+  :version "22.1"
   :type '(choice (const "smime")
                 (const "pgp")
                 (const "pgpauto")
@@ -83,6 +87,8 @@ 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."
+  :version "22.1"
+  :group 'message
   :type '(repeat (list (choice (const :tag "S/MIME" "smime")
                               (const :tag "PGP" "pgp")
                               (const :tag "PGP/MIME" "pgpmime")
@@ -112,7 +118,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
 
@@ -220,6 +226,13 @@ You can also customize or set `mml-signencrypt-style-alist' instead."
 ;; defuns that add the proper <#secure ...> tag to the top of the message body
 (defun mml-secure-message (method &optional modesym)
   (let ((mode (prin1-to-string modesym))
+       (tags (append
+              (if (or (eq modesym 'sign)
+                      (eq modesym 'signencrypt))
+                  (funcall (nth 2 (assoc method mml-sign-alist))))
+              (if (or (eq modesym 'encrypt)
+                      (eq modesym 'signencrypt))
+                  (funcall (nth 2 (assoc method mml-encrypt-alist))))))
        insert-loc)
     (mml-unsecure-message)
     (save-excursion
@@ -228,8 +241,8 @@ You can also customize or set `mml-signencrypt-style-alist' instead."
              (concat "^" (regexp-quote mail-header-separator) "\n") nil t)
             (goto-char (setq insert-loc (match-end 0)))
             (unless (looking-at "<#secure")
-              (mml-insert-tag
-               'secure 'method method 'mode mode)))
+              (apply 'mml-insert-tag
+               'secure 'method method 'mode mode tags)))
            (t (error
                "The message is corrupted. No mail header separator"))))
     (when (eql insert-loc (point))
@@ -289,4 +302,5 @@ If called with a prefix argument, only encrypt (do NOT sign)."
 
 (provide 'mml-sec)
 
+;;; arch-tag: 111c56e7-df5e-4287-87d7-93ed2911ec6c
 ;;; mml-sec.el ends here