Mercurial > emacs

comparison lisp/gnus/mm-view.el @ 90361:a7364c1a561e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-40 Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 135-143) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 49-55) - Merge from emacs--devo--0 - Update from CVS - Update from CVS: Makefile.in (release-*): New targets.
author Miles Bader <miles@gnu.org>
date Thu, 09 Mar 2006 07:15:37 +0000
parents 34c8b755296d 55d8c694b9cf
children 7eeafaaa9eab
comparison
equal deleted inserted replaced
90360:23b7c43b24ce 90361:a7364c1a561e
211 (setq mm-w3m-setup t)) 211 (setq mm-w3m-setup t))
212 (setq w3m-display-inline-images mm-inline-text-html-with-images)) 212 (setq w3m-display-inline-images mm-inline-text-html-with-images))
213 213
214 (defun mm-w3m-cid-retrieve-1 (url handle) 214 (defun mm-w3m-cid-retrieve-1 (url handle)
215 (dolist (elem handle) 215 (dolist (elem handle)
216 (when (listp elem) 216 (when (consp elem)
217 (if (equal url (mm-handle-id elem)) 217 (when (equal url (mm-handle-id elem))
218 (progn 218 (mm-insert-part elem)
219 (mm-insert-part elem) 219 (throw 'found-handle (mm-handle-media-type elem)))
220 (throw 'found-handle (mm-handle-media-type elem)))) 220 (when (and (stringp (car elem))
221 (if (equal "multipart" (mm-handle-media-supertype elem)) 221 (equal "multipart" (mm-handle-media-supertype elem)))
222 (mm-w3m-cid-retrieve-1 url elem))))) 222 (mm-w3m-cid-retrieve-1 url elem)))))
223 223
224 (defun mm-w3m-cid-retrieve (url &rest args) 224 (defun mm-w3m-cid-retrieve (url &rest args)
225 "Insert a content pointed by URL if it has the cid: scheme." 225 "Insert a content pointed by URL if it has the cid: scheme."
226 (when (string-match "\\`cid:" url) 226 (when (string-match "\\`cid:" url)
227 (catch 'found-handle 227 (or (catch 'found-handle
228 (mm-w3m-cid-retrieve-1 (concat "<" (substring url (match-end 0)) ">") 228 (mm-w3m-cid-retrieve-1
229 (with-current-buffer w3m-current-buffer 229 (setq url (concat "<" (substring url (match-end 0)) ">"))
230 gnus-article-mime-handles))))) 230 (with-current-buffer w3m-current-buffer
231 gnus-article-mime-handles)))
232 (prog1
233 nil
234 (message "Failed to find \"Content-ID: %s\"" url)))))
231 235
232 (defun mm-inline-text-html-render-with-w3m (handle) 236 (defun mm-inline-text-html-render-with-w3m (handle)
233 "Render a text/html part using emacs-w3m." 237 "Render a text/html part using emacs-w3m."
234 (mm-setup-w3m) 238 (mm-setup-w3m)
235 (let ((text (mm-get-part handle)) 239 (let ((text (mm-get-part handle))