From e7b37ae4df5998bf9658e0fad401b3c5ffbbad29 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jo=C3=A3o=20T=C3=A1vora?= Date: Tue, 26 Aug 2014 22:04:47 -0700 Subject: [PATCH] * net/shr.el (shr-expand-url): Plain expand-file-name is not enough; use url-expand-file-name. Fixes: debbugs:18310 --- lisp/ChangeLog | 5 +++++ lisp/net/shr.el | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3a53d8f9ce5..cdc36d35912 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-08-27 João Távora + + * 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 * emulation/cua-rect.el (cua--highlight-rectangle): diff --git a/lisp/net/shr.el b/lisp/net/shr.el index 58442575ad2..6d3ebe706a4 100644 --- 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)) -- 2.39.5