From: João Távora <joaotavora@gmail.com>
Date: Wed, 27 Aug 2014 05:04:47 +0000 (-0700)
Subject: * net/shr.el (shr-expand-url): Plain expand-file-name is not enough;
X-Git-Tag: emacs-24.3.94~77
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e7b37ae4df5998bf9658e0fad401b3c5ffbbad29;p=emacs.git

* net/shr.el (shr-expand-url): Plain expand-file-name is not enough;
use url-expand-file-name.

Fixes: debbugs:18310
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3a53d8f9ce5..cdc36d35912 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-27  João Távora  <joaotavora@gmail.com>
+
+	* net/shr.el (shr-expand-url): Plain expand-file-name is not enough;
+	use url-expand-file-name.  (Bug#18310)
+
 2014-08-25  Glenn Morris  <rgm@gnu.org>
 
 	* emulation/cua-rect.el (cua--highlight-rectangle):
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 58442575ad2..6d3ebe706a4 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -585,6 +585,8 @@ size, and full-buffer size."
 	  (url-type parsed)
 	  url)))
 
+(autoload 'url-expand-file-name "url-expand")
+
 (defun shr-expand-url (url &optional base)
   (setq base
 	(if base
@@ -610,7 +612,7 @@ size, and full-buffer size."
 	 (concat (nth 3 base) url))
 	(t
 	 ;; Totally relative.
-	 (concat (car base) (expand-file-name url (cadr base))))))
+	 (url-expand-file-name url (concat (car base) (cadr base))))))
 
 (defun shr-ensure-newline ()
   (unless (zerop (current-column))