* 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 3a53d8f9ce5957aaffaf0637ab7ce4d4ac170898..cdc36d359128be4c40d9e0ded7daf13a962aeeec 100644 (file)
--- 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 58442575ad2a9768bf8ae6978f75f0c0e135282a..6d3ebe706a48fe7f1df80b5f7b1243fb20a64d71 100644 (file)
--- 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))