Use the summary-local version of the mm-w3m-safe-url-regexp variable

to only download images in the groups where we want that to happen.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ff4d9e4..2b6eeea 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2010-08-29  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * gnus-html.el (gnus-html-prefetch-images): Use the summary-local
+       version of the mm-w3m-safe-url-regexp variable to only download images
+       in the groups where we want that to happen.
+
        * gnus-sum.el (gnus-summary-stop-at-end-of-message): New variable.
 
        * gnus-art.el (gnus-article-beginning-of-window): Make into defun for

diff --git a/lisp/gnus-async.el b/lisp/gnus-async.el
index a39821c..95ea488 100644 (file)
--- a/lisp/gnus-async.el
+++ b/lisp/gnus-async.el
@@ -238,7 +238,7 @@ that was fetched."
        (save-excursion
          (save-restriction
            (narrow-to-region mark (point-max))
-           (funcall gnus-async-post-fetch-function))))
+           (funcall gnus-async-post-fetch-function summary))))
       (gnus-async-with-semaphore
        (setq
         gnus-async-article-alist

diff --git a/lisp/gnus-html.el b/lisp/gnus-html.el
index a559679..8aa99d1 100644 (file)
--- a/lisp/gnus-html.el
+++ b/lisp/gnus-html.el
@@ -192,21 +192,25 @@
          (decf total-size (cadr file))
          (delete-file (nth 2 file)))))))
 
-(defun gnus-html-prefetch-images ()
-  (save-match-data
-    (let (urls)
-      (while (re-search-forward "<img.*src=[\"']\\([^\"']+\\)" nil t)
-       (let ((url (match-string 1)))
-         (when (or (null mm-w3m-safe-url-regexp)
-                   (string-match mm-w3m-safe-url-regexp url))
-           (unless (file-exists-p (gnus-html-image-id url))
-             (push url urls)
-             (push (gnus-html-image-id url) urls)
-             (push "-o" urls)))))
-      (apply 'start-process 
-            "images" nil "curl"
-            "-s" "--create-dirs"
-            "--location"
-            urls))))
+(defun gnus-html-prefetch-images (summary)
+  (let (safe-url-regexp urls)
+    (when (buffer-live-p summary)
+      (save-excursion
+       (set-buffer summary)
+       (setq safe-url-regexp mm-w3m-safe-url-regexp))
+      (save-match-data
+       (while (re-search-forward "<img.*src=[\"']\\([^\"']+\\)" nil t)
+         (let ((url (match-string 1)))
+           (when (or (null safe-url-regexp)
+                     (string-match safe-url-regexp url))
+             (unless (file-exists-p (gnus-html-image-id url))
+               (push url urls)
+               (push (gnus-html-image-id url) urls)
+               (push "-o" urls)))))
+       (apply 'start-process 
+              "images" nil "curl"
+              "-s" "--create-dirs"
+              "--location"
+              urls)))))
 
 ;;; gnus-html.el ends here