Commit a3eebe9b authored by Michael Albinus's avatar Michael Albinus
Browse files

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

Conflicts:
	lisp/ChangeLog
parents 38bb639d 4113ac25
...@@ -3,6 +3,11 @@ ...@@ -3,6 +3,11 @@
* files.el (directory-files-recursively): Do not include * files.el (directory-files-recursively): Do not include
superfluous remote file names. 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> 2015-01-10 Lars Magne Ingebrigtsen <larsi@gnus.org>
   
* net/shr.el (shr-urlify): Don't bother the user about * net/shr.el (shr-urlify): Don't bother the user about
......
...@@ -255,7 +255,9 @@ word(s) will be searched for via `eww-search-prefix'." ...@@ -255,7 +255,9 @@ word(s) will be searched for via `eww-search-prefix'."
((string-match-p "\\`ftp://" url) ((string-match-p "\\`ftp://" url)
(user-error "FTP is not supported.")) (user-error "FTP is not supported."))
(t (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 ;; Also try to match "naked" URLs like
;; en.wikipedia.org/wiki/Free software ;; en.wikipedia.org/wiki/Free software
(string-match "\\`[A-Za-z_]+\\.[A-Za-z._]+/" url) (string-match "\\`[A-Za-z_]+\\.[A-Za-z._]+/" url)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment