From: Julien Danjou <julien@danjou.info>
Date: Tue, 12 Oct 2010 19:50:50 +0000 (+0200)
Subject: shr: Encode URL properly when retrieving
X-Git-Url: https://cgit.sxemacs.org/?a=commitdiff_plain;h=0da4cabca533b36c3932de1fb6e0505a492ab733;p=gnus

shr: Encode URL properly when retrieving

Signed-off-by: Julien Danjou <julien@danjou.info>
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d5a1823a6..d8c649176 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2010-10-12  Julien Danjou  <julien@danjou.info>
 
+	* shr.el (shr-tag-img): Encode URL properly when retrieving.
+
 	* gnus-gravatar.el (gnus-gravatar-insert): Check if buffer is alive
 	before inserting the Gravatar.
 
diff --git a/lisp/shr.el b/lisp/shr.el
index 813d9a741..500ddabd3 100644
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -389,6 +389,10 @@ Return a string with image data."
     (put-text-property (or shr-start start) (point) 'keymap shr-map)
     (put-text-property (or shr-start start) (point) 'shr-url url)))
 
+(defun shr-encode-url (url)
+  "Encode URL."
+  (browse-url-url-encode-chars url "[)$ ]"))
+
 (defun shr-tag-img (cont)
   (when (and (> (current-column) 0)
 	     (not (eq shr-state 'image)))
@@ -422,12 +426,12 @@ Return a string with image data."
 	  (if (> (length alt) 8)
 	      (shr-insert (substring alt 0 8))
 	    (shr-insert alt))))
-       ((url-is-cached (browse-url-url-encode-chars url "[&)$ ]"))
+       ((url-is-cached (shr-encode-url url))
 	(shr-put-image (shr-get-image-data url) (point) alt))
        (t
 	(insert alt)
 	(ignore-errors
-	  (url-retrieve url 'shr-image-fetched
+	  (url-retrieve (shr-encode-url url) 'shr-image-fetched
 			(list (current-buffer) start (point-marker))
 			t))))
       (insert " ")