From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Thu, 2 Sep 2010 01:14:38 +0000 (+0000)
Subject: gnus-html.el (gnus-html-wash-tags): Check the value ofgnus-blocked-images in the... 
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~48^2~145
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9a4b54dbe6b0b363a7cbd1d09d864ccaf208d9f3;p=emacs.git

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

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 322408852c2..43a8195623c 100644
--- 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 d2d8989223a..00454665cad 100644
--- 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.