From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Kenjiro NAKAYAMA Newsgroups: gmane.emacs.bugs Subject: bug#15911: 24.3.50; [PATCH] eww: can not handle hostname "localhost" Date: Sat, 16 Nov 2013 21:56:52 +0900 Message-ID: <87ob5k33or.fsf@dhcp-193-97.nrt.redhat.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1384606726 3941 80.91.229.3 (16 Nov 2013 12:58:46 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 16 Nov 2013 12:58:46 +0000 (UTC) To: 15911@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Nov 16 13:58:51 2013 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 1VhfSa-0008T3-Fc for geb-bug-gnu-emacs@m.gmane.org; Sat, 16 Nov 2013 13:58:48 +0100 Original-Received: from localhost ([::1]:35672 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VhfSa-00019A-7A for geb-bug-gnu-emacs@m.gmane.org; Sat, 16 Nov 2013 07:58:48 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60892) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VhfSF-000164-OY for bug-gnu-emacs@gnu.org; Sat, 16 Nov 2013 07:58:44 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VhfRq-0006LI-Py for bug-gnu-emacs@gnu.org; Sat, 16 Nov 2013 07:58:27 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:42792) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VhfRq-0006L4-MW for bug-gnu-emacs@gnu.org; Sat, 16 Nov 2013 07:58:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1VhfRq-0006cm-8i for bug-gnu-emacs@gnu.org; Sat, 16 Nov 2013 07:58:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Kenjiro NAKAYAMA Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 16 Nov 2013 12:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 15911 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.138460665225421 (code B ref -1); Sat, 16 Nov 2013 12:58:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 16 Nov 2013 12:57:32 +0000 Original-Received: from localhost ([127.0.0.1]:56811 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1VhfRL-0006bs-3l for submit@debbugs.gnu.org; Sat, 16 Nov 2013 07:57:31 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:58201) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1VhfRC-0006bb-Ad for submit@debbugs.gnu.org; Sat, 16 Nov 2013 07:57:23 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VhfR1-0005yD-Ue for submit@debbugs.gnu.org; Sat, 16 Nov 2013 07:57:17 -0500 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:53581) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VhfR1-0005y9-RP for submit@debbugs.gnu.org; Sat, 16 Nov 2013 07:57:11 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59902) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VhfQw-0000oc-Gl for bug-gnu-emacs@gnu.org; Sat, 16 Nov 2013 07:57:11 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VhfQr-0005wU-Ba for bug-gnu-emacs@gnu.org; Sat, 16 Nov 2013 07:57:06 -0500 Original-Received: from mail-pb0-x229.google.com ([2607:f8b0:400e:c01::229]:38513) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VhfQr-0005wI-4K for bug-gnu-emacs@gnu.org; Sat, 16 Nov 2013 07:57:01 -0500 Original-Received: by mail-pb0-f41.google.com with SMTP id jt11so4820721pbb.28 for ; Sat, 16 Nov 2013 04:57:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=user-agent:from:to:subject:date:message-id:mime-version :content-type; bh=nrD3Uhvv4IgWEUN76FFWSmMxMKmX5ThTOSxOhRS3ptc=; b=jpfEUWe4FALcJcnBvIqkZWK5K2nD3GqB3QyoWs2QPvSpx1P+4FB2g7loDhWJOVbDrP 5cJT9ukT6+D0O70qzwpmoDiFagD//m+B/Hn3qW0FMHfDpvkQlG0QuoznYws6ylcWhZ7r XlKUZn/3406zamL5jOw8xAjc3dh8RNr0xZX5nj/b7iB1A4R+bM0ggu5rFXyFZDDZ1Stt +5s3oeIa5eVoI66zBS4MCfHUMO9/WCPJS626GuMSr6t29HjHbZiLyjoLcJdZKhnzrkVh UzYcw1B2vGqiNeZoqtpkLPXi5PU3hsabaxI+4gaAIoiHJvQRv2hJbE2ST5VVuhUoaaCY A8KA== X-Received: by 10.66.227.39 with SMTP id rx7mr11943629pac.44.1384606620094; Sat, 16 Nov 2013 04:57:00 -0800 (PST) Original-Received: from dhcp-193-97.nrt.redhat.com (nat-pool-nrt-t1.redhat.com. [66.187.238.10]) by mx.google.com with ESMTPSA id xs1sm12412967pac.7.2013.11.16.04.56.58 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 Nov 2013 04:56:59 -0800 (PST) User-agent: mu4e 0.9.9.6pre2; emacs 24.3.50.2 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). 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:80641 Archived-At: With M-x eww RET and "localhost" RET, eww searches "localhost" via ddg ("https://duckduckgo.com/html/?q=localhost"), so it does not handle "localhost" as "http://localhost/". This patch is not only to solve it but also becoming possible to open the non-extension files by eww-open-file. (Current eww-open-file can browse "exampleFile.html" but can't browse non-extension files like "exampleFile".) I know I should send sepalately, but the former problem should modify with the latter one at the same time since it is using same logic. Signed-off-by: Kenjiro Nakayama --- lisp/net/eww.el | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 573715e..6accf60 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -107,17 +107,20 @@ If the input doesn't look like an URL or a domain name, the word(s) will be searched for via `eww-search-prefix'." (interactive "sEnter URL or keywords: ") - (if (and (= (length (split-string url)) 1) - (> (length (split-string url "\\.")) 1)) - (progn - (unless (string-match-p "\\`[a-zA-Z][-a-zA-Z0-9+.]*://" url) - (setq url (concat "http://" url))) - ;; some site don't redirect final / - (when (string= (url-filename (url-generic-parse-url url)) "") - (setq url (concat url "/")))) - (unless (string-match-p "\\'file:" url) - (setq url (concat eww-search-prefix - (replace-regexp-in-string " " "+" url))))) + (cond ((string-match-p "\\`file:" url)) + (t + (if (and (= (length (split-string url)) 1) + (or (> (length (split-string url "\\.")) 1) + (string-match "localhost" url))) + (progn + (unless (string-match-p "\\`[a-zA-Z][-a-zA-Z0-9+.]*://" url) + (setq url (concat "http://" url))) + ;; some site don't redirect final / + (when (string= (url-filename (url-generic-parse-url url)) "") + (setq url (concat url "/")))) + (setq url (concat eww-search-prefix + (replace-regexp-in-string " " "+" url)))) + )) (url-retrieve url 'eww-render (list url))) ;;;###autoload -- 1.8.3.1