diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/eww.el | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5402775dfbb..f7caaf69358 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-12-24 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * net/eww.el (eww-open-file): Ensure 3 slashes after "file:" when | ||
| 4 | we run on MS-Windows or MS-DOS. | ||
| 5 | |||
| 1 | 2013-12-24 Martin Rudalics <rudalics@gmx.at> | 6 | 2013-12-24 Martin Rudalics <rudalics@gmx.at> |
| 2 | 7 | ||
| 3 | * window.el (balance-windows-area): Call window-size instead of | 8 | * window.el (balance-windows-area): Call window-size instead of |
diff --git a/lisp/net/eww.el b/lisp/net/eww.el index b7f50c19321..c5ac2f5c86c 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el | |||
| @@ -167,7 +167,10 @@ word(s) will be searched for via `eww-search-prefix'." | |||
| 167 | (defun eww-open-file (file) | 167 | (defun eww-open-file (file) |
| 168 | "Render a file using EWW." | 168 | "Render a file using EWW." |
| 169 | (interactive "fFile: ") | 169 | (interactive "fFile: ") |
| 170 | (eww (concat "file://" (expand-file-name file)))) | 170 | (eww (concat "file://" |
| 171 | (and (memq system-type '(windows-nt ms-dos)) | ||
| 172 | "/") | ||
| 173 | (expand-file-name file)))) | ||
| 171 | 174 | ||
| 172 | (defun eww-render (status url &optional point) | 175 | (defun eww-render (status url &optional point) |
| 173 | (let ((redirect (plist-get status :redirect))) | 176 | (let ((redirect (plist-get status :redirect))) |