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

use url-expand-file-name.

Fixes: debbugs:18310

lisp/ChangeLog

+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):

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))