Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
emacs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
emacs
emacs
Commits
a3eebe9b
Commit
a3eebe9b
authored
Jan 11, 2015
by
Michael Albinus
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Conflicts: lisp/ChangeLog
parents
38bb639d
4113ac25
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/net/eww.el
lisp/net/eww.el
+3
-1
No files found.
lisp/ChangeLog
View file @
a3eebe9b
...
...
@@ -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
View file @
a3eebe9b
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment