gnus-html.el (gnus-html-schedule-image-fetching): Decode entities before feeding URLs to curl.

gnus-async.el (gnus-async-article-callback): Call `gnus-html-prefetch-images' unconditionally.

3 files changed, 17 insertions, 9 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ba3f335e381..a3e4fe99510 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-08  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-async.el (gnus-async-article-callback): Call
+        `gnus-html-prefetch-images' unconditionally.
+
+        * gnus-html.el (gnus-html-schedule-image-fetching): Decode entities
+        before feeding URLs to curl.
+
 2010-09-07  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus-html.el (gnus-html-wash-tags, gnus-html-put-image): Mark cid and
diff --git a/lisp/gnus/gnus-async.el b/lisp/gnus/gnus-async.el
index 5b19adc2054..979e67120d1 100644
--- a/lisp/gnus/gnus-async.el
+++ b/lisp/gnus/gnus-async.el
@@ -237,13 +237,13 @@ that was fetched."
     (setq gnus-async-current-prefetch-article nil)
     (when arg
       (gnus-async-set-buffer)
-      (when gnus-async-post-fetch-function
-        (save-excursion
-          (save-restriction
-            (narrow-to-region mark (point-max))
-            ;; Prefetch images for the groups that want that.
-            (when (fboundp 'gnus-html-prefetch-images)
-              (gnus-html-prefetch-images summary))
+      (save-excursion
+        (save-restriction
+          (narrow-to-region mark (point-max))
+          ;; Prefetch images for the groups that want that.
+          (when (fboundp 'gnus-html-prefetch-images)
+            (gnus-html-prefetch-images summary))
+          (when gnus-async-post-fetch-function
             (funcall gnus-async-post-fetch-function summary))))
       (gnus-async-with-semaphore
         (setq
diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index bf9f0cd6b8d..9cd49a06598 100644
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/gnus-html.el
@@ -247,7 +247,7 @@ fit these criteria."
                    "--location"
                    "--max-time" "60"
                    "-o" (gnus-html-image-id url)
-                   url)))
+                   (mm-url-decode-entities-string url))))
     (process-kill-without-query process)
     (set-process-sentinel process 'gnus-html-curl-sentinel)
     (gnus-set-process-plist process (list 'images images
@@ -395,7 +395,7 @@ This only works if the article in question is HTML."
           (let ((url (match-string 1)))
             (unless (gnus-html-image-url-blocked-p url blocked-images)
               (unless (file-exists-p (gnus-html-image-id url))
-                (push url urls)
+                (push (mm-url-decode-entities-string url) urls)
                 (push (gnus-html-image-id url) urls)
                 (push "-o" urls)))))
         (let ((process