From: joaotavora@gmail.com (João Távora)
To: Eli Zaretskii <eliz@gnu.org>, monnier@iro.umontreal.ca
Cc: 18310@debbugs.gnu.org
Subject: bug#18310: 24.3.93; relative links don't work in eww and Windows 7
Date: Mon, 25 Aug 2014 18:23:11 +0100 [thread overview]
Message-ID: <jjbfvgkmqkg.fsf@gmail.com> (raw)
In-Reply-To: <83lhqhbyvg.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 21 Aug 2014 19:17:55 +0300")
Eli Zaretskii <eliz@gnu.org> writes:
>> PS: Had a look at `url-expand-file-name': isn't it doing to much for
>> `shr-expand-url''s purposes?
>
> I have no idea, but as long as you need to resolve relative URLs, it
> is your friend.
Back on topic, the diff in PS seems to work. With the new calling
convention, of first concatenating the car and cadr of `base', so does
`expand-file-name', by the way.
Can anyone verify and install it?
João
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 5844257..244d6d6 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -32,6 +32,8 @@
(eval-when-compile (require 'cl))
(eval-when-compile (require 'url)) ;For url-filename's setf handler.
+
+(require 'url-expand) ; For url-expand-file-name
(require 'browse-url)
(defgroup shr nil
@@ -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))
next prev parent reply other threads:[~2014-08-25 17:23 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-21 10:33 bug#18310: 24.3.93; relative links don't work in eww and Windows 7 João Távora
2014-08-21 14:04 ` Eli Zaretskii
2014-08-21 15:43 ` João Távora
2014-08-21 16:17 ` Eli Zaretskii
2014-08-21 16:54 ` João Távora
2014-08-21 19:17 ` Eli Zaretskii
2014-08-22 10:26 ` João Távora
2014-08-22 10:48 ` Eli Zaretskii
2014-08-22 14:39 ` Stefan Monnier
2014-08-22 15:25 ` Eli Zaretskii
2014-08-25 17:23 ` João Távora [this message]
2014-08-26 18:11 ` Glenn Morris
2014-08-26 20:37 ` João Távora
2014-08-27 5:05 ` Glenn Morris
2014-09-18 17:56 ` Lars Magne Ingebrigtsen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jjbfvgkmqkg.fsf@gmail.com \
--to=joaotavora@gmail.com \
--cc=18310@debbugs.gnu.org \
--cc=eliz@gnu.org \
--cc=monnier@iro.umontreal.ca \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.