From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Sat, 10 Jan 2015 15:20:44 +0000 (+0100)
Subject: Further eww DWIM URL interpretation fixups
X-Git-Tag: emacs-25.0.90~2605^2~11
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=790ca72b3e5790bd8af6f76831ac0c3dde01288e;p=emacs.git

Further eww DWIM URL interpretation fixups

(eww): Also interpret things like "en.wikipedia.org/wiki/Free
software" as an URL.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 808be4b6957..9bfcd504199 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,8 @@
 
 	* net/eww.el (eww): Always interpret URLs that start with https?:
 	as plain URLs, even if they have spaces in them (bug#19556).
+	(eww): Also interpret things like "en.wikipedia.org/wiki/Free
+	software" as an URL.
 
 2015-01-10  Daniel Colascione  <dancol@dancol.org>
 
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 52c1501fbe1..8278e3cc1ba 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -256,6 +256,9 @@ word(s) will be searched for via `eww-search-prefix'."
          (user-error "FTP is not supported."))
         (t
          (if (or (string-match "\\`https?:" url)
+		 ;; Also try to match "naked" URLs like
+		 ;; en.wikipedia.org/wiki/Free software
+		 (string-match "\\`[a-z._]+/" url)
 		 (and (= (length (split-string url)) 1)
 		      (or (and (not (string-match-p "\\`[\"\'].*[\"\']\\'" url))
 			       (> (length (split-string url "[.:]")) 1))
@@ -263,7 +266,7 @@ word(s) will be searched for via `eww-search-prefix'."
              (progn
                (unless (string-match-p "\\`[a-zA-Z][-a-zA-Z0-9+.]*://" url)
                  (setq url (concat "http://" url)))
-               ;; some site don't redirect final /
+               ;; Some sites do not redirect final /
                (when (string= (url-filename (url-generic-parse-url url)) "")
                  (setq url (concat url "/"))))
            (setq url (concat eww-search-prefix