Commit e7b37ae4 authored by João Távora's avatar João Távora Committed by Glenn Morris

* net/shr.el (shr-expand-url): Plain expand-file-name is not enough;

use url-expand-file-name.

Fixes: debbugs:18310
parent 825ca47f
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):
......
......@@ -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))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment