* gnus-msg.el (gnus-copy-article-buffer): Quote decoded words containing

[gnus] / lisp / mml2015.el

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 13a4a4d..9e0311c 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -1,5 +1,5 @@
 ;;; mml2015.el --- MIME Security with Pretty Good Privacy (PGP)
-;; Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: PGP MIME MML
@@ -36,7 +36,10 @@
 (defvar mml2015-use (or
                     (progn
                       (ignore-errors
-                        (require 'pgg))
+                       ;; Avoid the "Recursive load suspected" error
+                       ;; in Emacs 21.1.
+                       (let ((recursive-load-depth-limit 100))
+                         (require 'pgg)))
                       (and (fboundp 'pgg-sign-region)
                            'pgg))
                     (progn
@@ -50,7 +53,8 @@
                                 (fboundp 'mc-sign-generic)
                                 (fboundp 'mc-cleanup-recipient-headers)
                                 'mailcrypt)))
-  "The package used for PGP/MIME.")
+  "The package used for PGP/MIME.
+Valid packages include `pgg', `gpg' and `mailcrypt'.")
 
 ;; Something is not RFC2015.
 (defvar mml2015-function-alist
@@ -83,6 +87,8 @@
     ("TRUST_FULLY"     . t)
     ("TRUST_ULTIMATE"  . t))
   "Map GnuPG trust output values to a boolean saying if you trust the key."
+  :version "22.1"
+  :group 'mime-security
   :type '(repeat (cons (regexp :tag "GnuPG output regexp")
                       (boolean :tag "Trust key"))))
 
@@ -583,7 +589,7 @@
        ;; set up a function to call the correct gpg encrypt routine
        ;; with the right arguments. (FIXME: this should be done
        ;; differently.)
-       (flet ((gpg-encrypt-func 
+       (flet ((gpg-encrypt-func
                 (sign plaintext ciphertext result recipients &optional
                       passphrase sign-with-key armor textmode)
                 (if sign
@@ -654,7 +660,7 @@
        (if (condition-case err
                (prog1
                    (pgg-decrypt-region (point-min) (point-max))
-                 (setq decrypt-status 
+                 (setq decrypt-status
                        (with-current-buffer mml2015-result-buffer
                          (buffer-string)))
                  (mm-set-handle-multipart-parameter
@@ -738,7 +744,7 @@
          (mm-insert-part signature))
        (if (condition-case err
                (prog1
-                   (pgg-verify-region (point-min) (point-max) 
+                   (pgg-verify-region (point-min) (point-max)
                                       signature-file t)
                  (goto-char (point-min))
                  (while (search-forward "\r\n" nil t)
@@ -914,4 +920,5 @@
 
 (provide 'mml2015)
 
+;;; arch-tag: b04701d5-0b09-44d8-bed8-de901bf435f2
 ;;; mml2015.el ends here