diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/net/eww.el | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c55666a0cad..a1f6ceee6a5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-06-24 Ivan Kanis <ivan@kanis.fr> | ||
| 2 | |||
| 3 | * net/eww.el (eww): Add a trailing slash to domain names. | ||
| 4 | |||
| 1 | 2013-06-24 Juanma Barranquero <lekktu@gmail.com> | 5 | 2013-06-24 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 6 | ||
| 3 | * faces.el (face-spec-recalc): Revert part of 2013-06-23T20:29:18Z!lekktu@gmail.com (bug#14705). | 7 | * faces.el (face-spec-recalc): Revert part of 2013-06-23T20:29:18Z!lekktu@gmail.com (bug#14705). |
diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 535992513a2..7b37eda185e 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el | |||
| @@ -102,8 +102,12 @@ word(s) will be searched for via `eww-search-prefix'." | |||
| 102 | (interactive "sEnter URL or keywords: ") | 102 | (interactive "sEnter URL or keywords: ") |
| 103 | (if (and (= (length (split-string url)) 1) | 103 | (if (and (= (length (split-string url)) 1) |
| 104 | (> (length (split-string url "\\.")) 1)) | 104 | (> (length (split-string url "\\.")) 1)) |
| 105 | (unless (string-match-p "\\`[a-zA-Z][-a-zA-Z0-9+.]*://" url) | 105 | (progn |
| 106 | (setq url (concat "http://" url))) | 106 | (unless (string-match-p "\\`[a-zA-Z][-a-zA-Z0-9+.]*://" url) |
| 107 | (setq url (concat "http://" url))) | ||
| 108 | ;; some site don't redirect final / | ||
| 109 | (when (string= (url-filename (url-generic-parse-url url)) "") | ||
| 110 | (setq url (concat url "/")))) | ||
| 107 | (unless (string-match-p "^file:" url) | 111 | (unless (string-match-p "^file:" url) |
| 108 | (setq url (concat eww-search-prefix | 112 | (setq url (concat eww-search-prefix |
| 109 | (replace-regexp-in-string " " "+" url))))) | 113 | (replace-regexp-in-string " " "+" url))))) |