[Emacs-diffs] /srv/bzr/emacs/trunk r101283: gnus-html.el (gnus-html-wash-tags): Check the value ofgnus-blocked-images in the summary buffer.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101283
author: Lars Magne Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2010-09-02 01:14:38 +0000
message:
  gnus-html.el (gnus-html-wash-tags): Check the value ofgnus-blocked-images in 
the summary buffer.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-html.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-09-02 01:10:25 +0000
+++ b/lisp/gnus/ChangeLog       2010-09-02 01:14:38 +0000
@@ -1,3 +1,8 @@
+2010-09-01  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * gnus-html.el (gnus-html-wash-tags): Check the value of
+       gnus-blocked-images in the summary buffer.
+
 2010-09-01  Teodor Zlatanov  <address@hidden>
 
        * gnus-html.el (gnus-html-image-url-blocked-p): Doc fix.

=== modified file 'lisp/gnus/gnus-html.el'
--- a/lisp/gnus/gnus-html.el    2010-09-02 01:10:25 +0000
+++ b/lisp/gnus/gnus-html.el    2010-09-02 01:14:38 +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.