[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r117458: * net/shr.el (shr-expand-url): Plain exp
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] emacs-24 r117458: * net/shr.el (shr-expand-url): Plain expand-file-name is not enough; |
Date: |
Wed, 27 Aug 2014 05:04:57 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117458
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18310
author: João Távora <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Tue 2014-08-26 22:04:47 -0700
message:
* net/shr.el (shr-expand-url): Plain expand-file-name is not enough;
use url-expand-file-name.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/net/shr.el shr.el-20101002102929-yfzewk55rsg0mn93-1
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-08-25 16:40:53 +0000
+++ b/lisp/ChangeLog 2014-08-27 05:04:47 +0000
@@ -1,3 +1,8 @@
+2014-08-27 João Távora <address@hidden>
+
+ * 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 <address@hidden>
* emulation/cua-rect.el (cua--highlight-rectangle):
=== modified file 'lisp/net/shr.el'
--- a/lisp/net/shr.el 2014-04-14 22:01:54 +0000
+++ b/lisp/net/shr.el 2014-08-27 05:04:47 +0000
@@ -585,6 +585,8 @@
(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 @@
(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))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r117458: * net/shr.el (shr-expand-url): Plain expand-file-name is not enough;,
Glenn Morris <=