Mercurial > emacs

changeset 110276:07962d48d848

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Wed, 08 Sep 2010 23:51:10 +0000
parents f8f2730ec233
children a46aad43ce5a
files lisp/gnus/ChangeLog lisp/gnus/gnus-async.el lisp/gnus/gnus-html.el
diffstat 3 files changed, 17 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog	Wed Sep 08 22:44:34 2010 +0000
+++ b/lisp/gnus/ChangeLog	Wed Sep 08 23:51:10 2010 +0000
@@ -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
--- a/lisp/gnus/gnus-async.el	Wed Sep 08 22:44:34 2010 +0000
+++ b/lisp/gnus/gnus-async.el	Wed Sep 08 23:51:10 2010 +0000
@@ -237,13 +237,13 @@
     (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
--- a/lisp/gnus/gnus-html.el	Wed Sep 08 22:44:34 2010 +0000
+++ b/lisp/gnus/gnus-html.el	Wed Sep 08 23:51:10 2010 +0000
@@ -247,7 +247,7 @@
 		   "--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 @@
 	  (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