Fix relative links to parent directories in shr

* lisp/net/shr.el (shr-expand-url): Use `expand-file-name' for relative
links. .

Fixes: debbugs:17217

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6c0a099119de889d8637a95cfaeda31e940372d7..40690692e880d8c61718c1acec849867d45a1a44 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-14  João Távora  <joaotavora@gmail.com>
+
+       * net/shr.el (shr-expand-url): Use `expand-file-name' for relative
+       links.  (Bug#17217).
+
 2014-04-14  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
        * vc/ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer):

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 8b68b6f4bc7fbf355dee8d549a3149a45fec4901..58442575ad2a9768bf8ae6978f75f0c0e135282a 100644 (file)
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -610,7 +610,7 @@ size, and full-buffer size."
         (concat (nth 3 base) url))
        (t
         ;; Totally relative.
-        (concat (car base) (cadr base) url))))
+        (concat (car base) (expand-file-name url (cadr base))))))
 
 (defun shr-ensure-newline ()
   (unless (zerop (current-column))