aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/net
diff options
context:
space:
mode:
authorJoão Távora2014-04-14 23:01:54 +0100
committerJoão Távora2014-04-14 23:01:54 +0100
commitf596f897c6681236092a47cabf51d07abff2286b (patch)
tree2ac1fd151d9fdcb88cbb1d93ebd8664bbc6e1681 /lisp/net
parentac6ec89c158aae5c4e78fcf70efd19d42c0abbe3 (diff)
downloademacs-f596f897c6681236092a47cabf51d07abff2286b.tar.gz
emacs-f596f897c6681236092a47cabf51d07abff2286b.zip
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
Diffstat (limited to 'lisp/net')
-rw-r--r--lisp/net/shr.el2
1 files changed, 1 insertions, 1 deletions
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."
610 (concat (nth 3 base) url)) 610 (concat (nth 3 base) url))
611 (t 611 (t
612 ;; Totally relative. 612 ;; Totally relative.
613 (concat (car base) (cadr base) url)))) 613 (concat (car base) (expand-file-name url (cadr base))))))
614 614
615(defun shr-ensure-newline () 615(defun shr-ensure-newline ()
616 (unless (zerop (current-column)) 616 (unless (zerop (current-column))