From: yamaoka <yamaoka>
Date: Mon, 18 Oct 2004 23:03:04 +0000 (+0000)
Subject: Synch to No Gnus 200410182302.
X-Git-Tag: t-gnus-6_17_4-quimby-~703
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=19b1212db92a28727c9fcb1ab731663fe71e9da7;p=elisp%2Fgnus.git-

Synch to No Gnus 200410182302.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0a2a62b..31f61a6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-18  David Edmondson  <dme@dme.org>
+
+	* mm-view.el (mm-w3m-cid-retrieve-1): Don't use recursive call
+	excessively.
+
 2004-10-18  Teodor Zlatanov  <tzz@lifelogs.com>
 
 	* gnus-util.el (gnus-split-references): accept a nil references
diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 859704d..4152011 100644
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -202,13 +202,14 @@
   (setq w3m-display-inline-images mm-inline-text-html-with-images))
 
 (defun mm-w3m-cid-retrieve-1 (url handle)
-  (if (mm-multiple-handles handle)
-      (dolist (elem handle)
-	(mm-w3m-cid-retrieve-1 url elem))
-    (when (and (listp handle)
-	       (equal url (mm-handle-id handle)))
-      (mm-insert-part handle)
-      (throw 'found-handle (mm-handle-media-type handle)))))
+  (dolist (elem handle)
+    (when (listp elem)
+      (if (equal url (mm-handle-id elem))
+	  (progn
+	    (mm-insert-part elem)
+	    (throw 'found-handle (mm-handle-media-type elem))))
+      (if (equal "multipart" (mm-handle-media-supertype elem))
+	  (mm-w3m-cid-retrieve-1 url elem)))))
 
 (defun mm-w3m-cid-retrieve (url &rest args)
   "Insert a content pointed by URL if it has the cid: scheme."