aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Shmakov2014-11-02 16:40:30 -0500
committerTed Zlatanov2014-11-02 16:40:30 -0500
commit7e35a478d0de130eb5e7a43689518690f83efd8f (patch)
tree040f13faf9dfd3821a0ca181094d5e28bc6031bd
parentcc6340495d3ec78dea0b906dccfea90973fbeb12 (diff)
downloademacs-7e35a478d0de130eb5e7a43689518690f83efd8f.tar.gz
emacs-7e35a478d0de130eb5e7a43689518690f83efd8f.zip
* net/eww.el (eww): Recognize colon-delimited IPv6 addresses..
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/eww.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 67d81e0eb01..a4ae2ed7a3e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-11-02 Ivan Shmakov <ivan@siamics.net>
2
3 * net/eww.el (eww): Recognize colon-delimited IPv6 addresses.
4 (Bug#18603).
5
12014-11-02 Brian McKenna <brian@brianmckenna.org> (tiny change) 62014-11-02 Brian McKenna <brian@brianmckenna.org> (tiny change)
2 7
3 * net/eww.el (eww-submit): Encode empty form values as "". 8 * net/eww.el (eww-submit): Encode empty form values as "".
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 508559e6531..0f0a5924158 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -165,7 +165,7 @@ word(s) will be searched for via `eww-search-prefix'."
165 (t 165 (t
166 (if (and (= (length (split-string url)) 1) 166 (if (and (= (length (split-string url)) 1)
167 (or (and (not (string-match-p "\\`[\"\'].*[\"\']\\'" url)) 167 (or (and (not (string-match-p "\\`[\"\'].*[\"\']\\'" url))
168 (> (length (split-string url "\\.")) 1)) 168 (> (length (split-string url "[.:]")) 1))
169 (string-match eww-local-regex url))) 169 (string-match eww-local-regex url)))
170 (progn 170 (progn
171 (unless (string-match-p "\\`[a-zA-Z][-a-zA-Z0-9+.]*://" url) 171 (unless (string-match-p "\\`[a-zA-Z][-a-zA-Z0-9+.]*://" url)