diff options
| author | Lars Magne Ingebrigtsen | 2014-11-13 17:59:35 +0100 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2014-11-13 17:59:42 +0100 |
| commit | 02ee710a0b9c1761ec935aeb0097eb5aa8d311ac (patch) | |
| tree | 3341987b578f2cd5a56b028e696cceec1d07a0a5 /lisp | |
| parent | 51475d535edd0ee021091dfe3fa576b0bf9f1358 (diff) | |
| download | emacs-02ee710a0b9c1761ec935aeb0097eb5aa8d311ac.tar.gz emacs-02ee710a0b9c1761ec935aeb0097eb5aa8d311ac.zip | |
* net/eww.el (eww): Add comment to clarify.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/net/eww.el | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5be04a7af02..0ad71f39634 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2014-11-13 Lars Magne Ingebrigtsen <larsi@gnus.org> | 1 | 2014-11-13 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 2 | ||
| 3 | * net/eww.el (eww): Add comment to clarify. | ||
| 4 | |||
| 3 | * net/shr.el (shr-parse-image-data): Remove blocked bits from | 5 | * net/shr.el (shr-parse-image-data): Remove blocked bits from |
| 4 | external SVG images. | 6 | external SVG images. |
| 5 | (shr-tag-object): Display images in <object> forms (bug#16244). | 7 | (shr-tag-object): Display images in <object> forms (bug#16244). |
diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 329c94407c2..0fa79cb1075 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el | |||
| @@ -160,6 +160,7 @@ word(s) will be searched for via `eww-search-prefix'." | |||
| 160 | (interactive "sEnter URL or keywords: ") | 160 | (interactive "sEnter URL or keywords: ") |
| 161 | (setq url (string-trim url)) | 161 | (setq url (string-trim url)) |
| 162 | (cond ((string-match-p "\\`file:/" url)) | 162 | (cond ((string-match-p "\\`file:/" url)) |
| 163 | ;; Don't mangle file: URLs at all. | ||
| 163 | ((string-match-p "\\`ftp://" url) | 164 | ((string-match-p "\\`ftp://" url) |
| 164 | (user-error "FTP is not supported.")) | 165 | (user-error "FTP is not supported.")) |
| 165 | (t | 166 | (t |