From: yamaoka <yamaoka>
Date: Tue, 15 Feb 2005 00:46:13 +0000 (+0000)
Subject: Synch to No Gnus 200502150045.
X-Git-Tag: t-gnus-6_17_4-quimby-~558
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ddc29404a95cc99fa50d0a8034ee812aa727a0f;p=elisp%2Fgnus.git-

Synch to No Gnus 200502150045.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 841fc05..d5d5f10 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-art.el: Avoid "Recursive load suspected" error in Emacs 21.1.
+
 2005-02-14  Teodor Zlatanov  <tzz@lifelogs.com>
 
 	* gnus.el (spam-contents): improve docs for spam-contents
@@ -888,7 +892,6 @@
 	* hashcash.el: Fix URL in comment, reported by Cheng Gao
 	<chenggao@gmail.com>.
 
->>>>>>> 7.511
 2004-10-25  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* html2text.el (html2text-buffer-head): Remove.  Use `goto-char'
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 0891d4f..3140bd9 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -35,7 +35,10 @@
 
 (require 'path-util)
 (require 'gnus)
-(require 'gnus-sum)
+;; Avoid the "Recursive load suspected" error in Emacs 21.1.
+(eval-and-compile
+  (let ((recursive-load-depth-limit 100))
+    (require 'gnus-sum)))
 (require 'gnus-spec)
 (require 'gnus-int)
 (require 'gnus-win)