(eww): Don't interpret "org/foo" as an URL.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9bfcd504199b04edbeeaf81e9da1f2aa09a981c2..ac0701f8619da763c2dca9281d6b24eb09f20fd0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4,6 +4,7 @@
        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.
+       (eww): Don't interpret "org/foo" as an URL.
 
 2015-01-10  Daniel Colascione  <dancol@dancol.org>
 

diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 8278e3cc1ba7ef5e8690ebfbbf5e47bfca8f37a2..46b076050007d5316d49032057be6e2d4a24a300 100644 (file)
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -258,7 +258,7 @@ word(s) will be searched for via `eww-search-prefix'."
          (if (or (string-match "\\`https?:" url)
                 ;; Also try to match "naked" URLs like
                 ;; en.wikipedia.org/wiki/Free software
-                (string-match "\\`[a-z._]+/" url)
+                (string-match "\\`[A-Za-z_]+\\.[A-Za-z._]+/" url)
                 (and (= (length (split-string url)) 1)
                      (or (and (not (string-match-p "\\`[\"\'].*[\"\']\\'" url))
                               (> (length (split-string url "[.:]")) 1))