mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-22 16:01:04 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
use url-expand-file-name.

Fixes: debbugs:18310
This commit is contained in:
João Távora 2014-08-26 22:04:47 -07:00 • committed by Glenn Morris
parent 825ca47f5a
commit e7b37ae4df
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
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):

4
lisp/net/shr.el
View file

@ -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))