changeset 110106:8e1063b66037

gnus-html.el (gnus-html-wash-tags): Check the value ofgnus-blocked-images in the summary buffer.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Thu, 02 Sep 2010 01:14:38 +0000
parents a2011a3c7791
children ffa0ce354f9d
files lisp/gnus/ChangeLog lisp/gnus/gnus-html.el
diffstat 2 files changed, 11 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog	Thu Sep 02 01:10:25 2010 +0000
+++ b/lisp/gnus/ChangeLog	Thu Sep 02 01:14:38 2010 +0000
@@ -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.
--- a/lisp/gnus/gnus-html.el	Thu Sep 02 01:10:25 2010 +0000
+++ b/lisp/gnus/gnus-html.el	Thu Sep 02 01:14:38 2010 +0000
@@ -136,7 +136,12 @@
 		    (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.