From 19b1212db92a28727c9fcb1ab731663fe71e9da7 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Mon, 18 Oct 2004 23:03:04 +0000 Subject: [PATCH] Synch to No Gnus 200410182302. --- lisp/ChangeLog | 5 +++++ lisp/mm-view.el | 15 ++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) 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 + + * mm-view.el (mm-w3m-cid-retrieve-1): Don't use recursive call + excessively. + 2004-10-18 Teodor Zlatanov * 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." -- 1.7.10.4