aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2010-09-02 01:14:38 +0000
committerKatsumi Yamaoka2010-09-02 01:14:38 +0000
commit9a4b54dbe6b0b363a7cbd1d09d864ccaf208d9f3 (patch)
tree5fd397588ddbd8e38972b49ef4ab1ed942f9f3d5
parent9a047bac913621d53260f9e577567a6a0e1ddf12 (diff)
downloademacs-9a4b54dbe6b0b363a7cbd1d09d864ccaf208d9f3.tar.gz
emacs-9a4b54dbe6b0b363a7cbd1d09d864ccaf208d9f3.zip
gnus-html.el (gnus-html-wash-tags): Check the value ofgnus-blocked-images in the summary buffer.
-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 322408852c2..43a8195623c 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
12010-09-01 Lars Magne Ingebrigtsen <larsi@gnus.org>
2
3 * gnus-html.el (gnus-html-wash-tags): Check the value of
4 gnus-blocked-images in the summary buffer.
5
12010-09-01 Teodor Zlatanov <tzz@lifelogs.com> 62010-09-01 Teodor Zlatanov <tzz@lifelogs.com>
2 7
3 * gnus-html.el (gnus-html-image-url-blocked-p): Doc fix. 8 * 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."
136 (delete-region start end) 136 (delete-region start end)
137 (gnus-put-image image (gnus-string-or string "*"))))) 137 (gnus-put-image image (gnus-string-or string "*")))))
138 ;; Normal, external URL. 138 ;; Normal, external URL.
139 (unless (gnus-html-image-url-blocked-p url gnus-blocked-images) 139 (unless (gnus-html-image-url-blocked-p
140 url
141 (if (buffer-live-p gnus-summary-buffer)
142 (with-current-buffer gnus-summary-buffer
143 gnus-blocked-images)
144 gnus-blocked-images))
140 (let ((file (gnus-html-image-id url))) 145 (let ((file (gnus-html-image-id url)))
141 (if (file-exists-p file) 146 (if (file-exists-p file)
142 ;; It's already cached, so just insert it. 147 ;; It's already cached, so just insert it.