From: yamaoka <yamaoka>
Date: Fri, 9 Apr 2004 00:04:07 +0000 (+0000)
Subject: Synch to No Gnus 200404090003.
X-Git-Tag: t-gnus-6_17_4-quimby-~983
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=cbec862b14400054350c38a56b4ecd71b01cdc95;p=elisp%2Fgnus.git-

Synch to No Gnus 200404090003.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 27bed39..b921ab9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mml2015.el (mml2015-use): Avoid the "Recursive load suspected"
+	error in Emacs 21.1.
+
 2004-04-08  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* gnus-start.el (gnus-get-unread-articles): Fix last commit.
diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 166d49c..96ca14a 100644
--- 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