diff options
| author | João Távora <joaotavora@gmail.com> | 2014-04-14 23:01:54 +0100 |
|---|---|---|
| committer | João Távora <joaotavora@gmail.com> | 2014-04-14 23:01:54 +0100 |
| commit | ef5b917d6448f4a2983746d3b43541defa3cb9d2 (patch) | |
| tree | 64bd8d4351ce9e6ce6bf4c2db36b0f8ee4e4276e | |
| parent | 00cbdba426ab08964ee8eae14a890945df33b595 (diff) | |
| download | emacs-ef5b917d6448f4a2983746d3b43541defa3cb9d2.tar.gz | |
Fix relative links to parent directories in shr
* lisp/net/shr.el (shr-expand-url): Use `expand-file-name' for relative
links. .
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/shr.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c2c1a96bf7b..a77ccddb50b 100644 --- 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 8b68b6f4bc7..58442575ad2 100644 --- 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)) |