gnus-html.el (gnus-html-wash-tags): Check the value ofgnus-blocked-images in the...

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 322408852c2ba7daef1ad2a9ef951f420a211acd..43a8195623cf26ca1ded7b9efe647da8ea62484b 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus-html.el (gnus-html-wash-tags): Check the value of
+       gnus-blocked-images in the summary buffer.
+
 2010-09-01  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * gnus-html.el (gnus-html-image-url-blocked-p): Doc fix.

diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index d2d8989223a5f9ef7c2811197a6522ebe1ee1ea5..00454665cad45916a5f00ec49ae754e17e4b2a25 100644 (file)
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/gnus-html.el
@@ -136,7 +136,12 @@ fit these criteria."
                    (delete-region start end)
                    (gnus-put-image image (gnus-string-or string "*")))))
            ;; Normal, external URL.
-           (unless (gnus-html-image-url-blocked-p url gnus-blocked-images)
+           (unless (gnus-html-image-url-blocked-p
+                    url
+                    (if (buffer-live-p gnus-summary-buffer)
+                        (with-current-buffer gnus-summary-buffer
+                          gnus-blocked-images)
+                      gnus-blocked-images))
              (let ((file (gnus-html-image-id url)))
                (if (file-exists-p file)
                    ;; It's already cached, so just insert it.