aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/gnus/ChangeLog5
-rw-r--r--lisp/gnus/gnus-html.el7
2 files changed, 11 insertions, 1 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 322408852c..43a8195623 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-01 Lars Magne Ingebrigtsen <[email protected]>
+
+ * gnus-html.el (gnus-html-wash-tags): Check the value of
+ gnus-blocked-images in the summary buffer.
+
2010-09-01 Teodor Zlatanov <[email protected]>
* 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 d2d8989223..00454665ca 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.