Take a parameter for blocked-images since it needs to be picked from the correct...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 63f9a31..3c1e2cc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,8 @@
 
        * gnus-html.el (gnus-html-wash-tags): "A" is also used for links, just
        like "a", it seems like.
+       (gnus-html-image-url-blocked-p): Take a parameter for blocked-images
+       since it needs to be picked from the correct buffer.
 
        * nnwfm.el: Removed.
 

diff --git a/lisp/gnus-html.el b/lisp/gnus-html.el
index d4cbb78..a78c617 100644 (file)
--- a/lisp/gnus-html.el
+++ b/lisp/gnus-html.el
@@ -136,7 +136,7 @@ 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)
+           (unless (gnus-html-image-url-blocked-p url gnus-blocked-images)
              (let ((file (gnus-html-image-id url)))
                (if (file-exists-p file)
                    ;; It's already cached, so just insert it.
@@ -285,10 +285,10 @@ fit these criteria."
          (delete-file (nth 2 file)))))))
 
 
-(defun gnus-html-image-url-blocked-p (url)
+(defun gnus-html-image-url-blocked-p (url blocked-images)
 "Find out if URL is blocked by `gnus-blocked-images'."
-  (let ((ret (and gnus-blocked-images
-                  (string-match gnus-blocked-images url))))
+  (let ((ret (and blocked-images
+                  (string-match blocked-images url))))
     (when ret
       (gnus-message 8 "Image URL %s is blocked by gnus-blocked-images regex %s" url gnus-blocked-images))
     ret))
@@ -302,7 +302,7 @@ fit these criteria."
       (save-match-data
        (while (re-search-forward "<img.*src=[\"']\\([^\"']+\\)" nil t)
          (let ((url (match-string 1)))
-           (unless (gnus-html-image-url-blocked-p url)
+           (unless (gnus-html-image-url-blocked-p url blocked-images)
               (unless (file-exists-p (gnus-html-image-id url))
                 (push url urls)
                 (push (gnus-html-image-id url) urls)