Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

Conflicts:
	lisp/ChangeLog

lisp/ChangeLog

@@ -3,6 +3,11 @@
 	* files.el (directory-files-recursively): Do not include
 	superfluous remote file names.
+2015-01-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* net/eww.el (eww): Interpret anything that looks like a protocol
+	designator as a full URL.
+
 2015-01-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 	* net/shr.el (shr-urlify): Don't bother the user about

lisp/net/eww.el

@@ -255,7 +255,9 @@ word(s) will be searched for via `eww-search-prefix'."
         ((string-match-p "\\`ftp://" url)
          (user-error "FTP is not supported."))
         (t
-         (if (or (string-match "\\`https?:" url)
+	 ;; Anything that starts with something that vaguely looks
+	 ;; like a protocol designator is interpreted as a full URL.
+         (if (or (string-match "\\`[A-Za-z]+:" url)
 		 ;; Also try to match "naked" URLs like
 		 ;; en.wikipedia.org/wiki/Free software
 		 (string-match "\\`[A-Za-z_]+\\.[A-Za-z._]+/" url)