From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: joaotavora@gmail.com (=?UTF-8?Q?Jo=C3=A3o_?= =?UTF-8?Q?T=C3=A1vora?=) Newsgroups: gmane.emacs.bugs 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 Message-ID: References: <83wqa2aqgu.fsf@gnu.org> <83lhqhbyvg.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1408987467 18139 80.91.229.3 (25 Aug 2014 17:24:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Aug 2014 17:24:27 +0000 (UTC) Cc: 18310@debbugs.gnu.org To: Eli Zaretskii , monnier@iro.umontreal.ca Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Aug 25 19:24:19 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XLy0A-00048V-Kk for geb-bug-gnu-emacs@m.gmane.org; Mon, 25 Aug 2014 19:24:18 +0200 Original-Received: from localhost ([::1]:49570 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XLy09-0000Mv-O0 for geb-bug-gnu-emacs@m.gmane.org; Mon, 25 Aug 2014 13:24:17 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48401) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XLy00-0000L3-KK for bug-gnu-emacs@gnu.org; Mon, 25 Aug 2014 13:24:14 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XLxzu-00071D-NR for bug-gnu-emacs@gnu.org; Mon, 25 Aug 2014 13:24:08 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:44984) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XLxzu-000718-Jj for bug-gnu-emacs@gnu.org; Mon, 25 Aug 2014 13:24:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1XLxzu-0004t9-5m for bug-gnu-emacs@gnu.org; Mon, 25 Aug 2014 13:24:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: joaotavora@gmail.com (=?UTF-8?Q?Jo=C3=A3o_?= =?UTF-8?Q?T=C3=A1vora?=) Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 25 Aug 2014 17:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 18310 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 18310-submit@debbugs.gnu.org id=B18310.140898740718742 (code B ref 18310); Mon, 25 Aug 2014 17:24:02 +0000 Original-Received: (at 18310) by debbugs.gnu.org; 25 Aug 2014 17:23:27 +0000 Original-Received: from localhost ([127.0.0.1]:51927 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XLxzK-0004sD-Jj for submit@debbugs.gnu.org; Mon, 25 Aug 2014 13:23:27 -0400 Original-Received: from mail-wi0-f174.google.com ([209.85.212.174]:40214) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XLxzH-0004rr-Md for 18310@debbugs.gnu.org; Mon, 25 Aug 2014 13:23:24 -0400 Original-Received: by mail-wi0-f174.google.com with SMTP id d1so2907038wiv.13 for <18310@debbugs.gnu.org>; Mon, 25 Aug 2014 10:23:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:in-reply-to:references:user-agent:date :message-id:mime-version:content-type:content-transfer-encoding; bh=h0B7+c9KMSOjZnAW7IqJIOGxcfqqTRPDnEY//yr0Xms=; b=ELXZVWmaXlFhBsnQ7fymufX+bUTJxWKGd7Nj4TccJv5jPNeDw1DIAwdVhuMs08uiyN FOtUGSBhrpT72HIyk2T/p+E2Cf5LcHg3l/Q+JhJAgyM1pv51s5X7z9stGcL2i7bAW5fV AoxlIJyMx9HOuWcJsz8ZcL6c+CCb9vngwnEbdcsi258W0PFPbUErFmAWH13o7UubZGYy SfivbvzE85LX4F1aKNpD7UmgxN6hBA+ftr2QHXWG77bdYKDlkW7ck5bUHmy0ahvh1BQ9 2PJsIijN255JdvxqPVxQ4ppaj1wrvLPEfgSV6eAJfVV+W9adhwpv8G/l5MFlHR/2EAu/ 1+cQ== X-Received: by 10.195.13.34 with SMTP id ev2mr23329634wjd.55.1408987398054; Mon, 25 Aug 2014 10:23:18 -0700 (PDT) Original-Received: from GONDOMAR.yourcompany.com (mail3.siscog.pt. [195.23.29.18]) by mx.google.com with ESMTPSA id pk9sm1145260wjb.16.2014.08.25.10.23.16 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Aug 2014 10:23:17 -0700 (PDT) In-Reply-To: <83lhqhbyvg.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 21 Aug 2014 19:17:55 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.93 (windows-nt) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:92669 Archived-At: Eli Zaretskii 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=E3o 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 @@ =20 (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) =20 (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)))))) =20 (defun shr-ensure-newline () (unless (zerop (current-column))