[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master a3eebe9 2/2: Merge branch 'master' of git.sv.gnu.or
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] master a3eebe9 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs |
Date: |
Sun, 11 Jan 2015 15:02:04 +0000 |
branch: master
commit a3eebe9bbd78b16557b003a75f42bf1225c90414
Merge: 38bb639 4113ac2
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Conflicts:
lisp/ChangeLog
---
lisp/ChangeLog | 5 +++++
lisp/net/eww.el | 4 +++-
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fba541f..598f9c6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,11 @@
* files.el (directory-files-recursively): Do not include
superfluous remote file names.
+2015-01-11 Lars Magne Ingebrigtsen <address@hidden>
+
+ * net/eww.el (eww): Interpret anything that looks like a protocol
+ designator as a full URL.
+
2015-01-10 Lars Magne Ingebrigtsen <address@hidden>
* net/shr.el (shr-urlify): Don't bother the user about
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 6a6da17..71094b1 100644
--- a/lisp/net/eww.el
+++ b/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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master a3eebe9 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs,
Michael Albinus <=