diff lisp/gnus/mm-decode.el @ 110777:895607aec71e

Merge changes made in Gnus trunk. mm-decode.el (mm-shr): Bind shr-blocked-images to gnus-blocked-images. shr.el (shr-tag-table): Put all the images after the table. shr.el (shr-tag-table): Really inhibit images inside the table. shr.el (shr-collect-overlays): Copy over overlays from the TD elements to the main document. nnimap.el (nnimap-request-newgroups): Return success. gnus-group.el (gnus-group-make-group): Doc fix. nnir.el (nnir-retrieve-headers): Don't bug out on invalid data. gnus-sum.el (gnus-article-sort-by-most-recent-date): New function, added for symmetry. mm-decode.el (mm-shr): Allow displaying cid: images from shr.el. shr.el (shr-insert-table): Bind free variable. gnus-art.el (gnus-blocked-images): Move variable here. mm-decode.el (mm-shr): Require shr. shr.el (shr-tag-img): Shorten ALT texts and allow them to be line-broken. shr.el (shr-tag-img): Ignore image fetching errors. shr.el (shr-overlays-in-region): Compute overlay positions correctly. gnus-html.el (gnus-html-schedule-image-fetching): Protect against invalid URLs.

--- a/lisp/gnus/mm-decode.el	Tue Oct 05 16:20:24 2010 +0200
+++ b/lisp/gnus/mm-decode.el	Tue Oct 05 22:43:06 2010 +0000
@@ -1684,7 +1684,16 @@
 (declare-function shr-insert-document "shr" (dom))
 
 (defun mm-shr (handle)
+  ;; Require since we bind its variables.
+  (require 'shr)
   (let ((article-buffer (current-buffer))
+	(shr-blocked-images (with-current-buffer gnus-summary-buffer
+			      gnus-blocked-images))
+	(shr-content-function (lambda (id)
+				(let ((handle (mm-get-content-id id)))
+				  (when handle
+				    (mm-with-part handle
+				      (buffer-string))))))
 	charset)
     (unless handle
       (setq handle (mm-dissect-buffer t)))