diff options
| author | Juri Linkov <juri@jurta.org> | 2013-12-17 23:17:05 +0200 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2013-12-17 23:17:05 +0200 |
| commit | 7a409b30053cf0c48ff5de7c5d9b408493df1054 (patch) | |
| tree | 2a55b913db56fb204f9011d2068f366ce303db55 /lisp/net | |
| parent | e9ad5665ede9f7599b7b26a7e478fd3e56ddf36e (diff) | |
| download | emacs-7a409b30053cf0c48ff5de7c5d9b408493df1054.tar.gz | |
* lisp/menu-bar.el (menu-bar-tools-menu): Add `browse-web'.
* lisp/startup.el (fancy-startup-screen, fancy-about-screen):
Set browse-url-browser-function to eww-browse-url locally.
(Bug#14751)
* lisp/net/browse-url.el (browse-url-browser-function): Move `eww'
closer to similar functions.
* lisp/net/eww.el (browse-web): Add alias to `eww'.
(eww-mode-map): Bind "r" to `eww-forward-url' like in Info.
Bind "S-SPC" to `scroll-down-command'. (Bug#16178)
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/browse-url.el | 2 | ||||
| -rw-r--r-- | lisp/net/eww.el | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index 461a0543829..d58445cdcd2 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el @@ -227,13 +227,13 @@ regexp should probably be \".\" to specify a default browser." (function-item :tag "Emacs W3" :value browse-url-w3) (function-item :tag "W3 in another Emacs via `gnudoit'" :value browse-url-w3-gnudoit) + (function-item :tag "eww" :value eww-browse-url) (function-item :tag "Mozilla" :value browse-url-mozilla) (function-item :tag "Firefox" :value browse-url-firefox) (function-item :tag "Chromium" :value browse-url-chromium) (function-item :tag "Galeon" :value browse-url-galeon) (function-item :tag "Epiphany" :value browse-url-epiphany) (function-item :tag "Netscape" :value browse-url-netscape) - (function-item :tag "eww" :value eww-browse-url) (function-item :tag "Mosaic" :value browse-url-mosaic) (function-item :tag "Mosaic using CCI" :value browse-url-cci) (function-item :tag "Text browser in an xterm window" diff --git a/lisp/net/eww.el b/lisp/net/eww.el index a4cec26dbf9..bff5cd8f2d3 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -159,6 +159,8 @@ word(s) will be searched for via `eww-search-prefix'." (replace-regexp-in-string " " "+" url)))))) (url-retrieve url 'eww-render (list url))) +;;;###autoload (defalias 'browse-web 'eww) + ;;;###autoload (defun eww-open-file (file) "Render a file using EWW." @@ -399,10 +401,11 @@ word(s) will be searched for via `eww-search-prefix'." (define-key map [tab] 'shr-next-link) (define-key map [backtab] 'shr-previous-link) (define-key map [delete] 'scroll-down-command) + (define-key map [?\S-\ ] 'scroll-down-command) (define-key map "\177" 'scroll-down-command) (define-key map " " 'scroll-up-command) (define-key map "l" 'eww-back-url) - (define-key map "f" 'eww-forward-url) + (define-key map "r" 'eww-forward-url) (define-key map "n" 'eww-next-url) (define-key map "p" 'eww-previous-url) (define-key map "u" 'eww-up-url) |