* 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)

5 files changed, 25 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 86b52fe5339..55a99103c93 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
+2013-12-17  Juri Linkov  <juri@jurta.org>
+
+        * menu-bar.el (menu-bar-tools-menu): Add `browse-web'.
+        (Bug#14751)
+
+        * 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)
+
+        * net/browse-url.el (browse-url-browser-function): Move `eww'
+        closer to similar functions.
+
+        * startup.el (fancy-startup-screen, fancy-about-screen):
+        Set browse-url-browser-function to eww-browse-url locally.
+        (Bug#14751)
+
 2013-12-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * window.el (window--pixel-to-total): Remove unused `mini' var.
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 1f9d66f3738..f0693a0a272 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1418,6 +1418,8 @@ mail status in mode line"))
     (bindings--define-key menu [separator-net]
       menu-bar-separator)
 
+    (bindings--define-key menu [browse-web]
+      '(menu-item "Browse the Web..." browse-web))
     (bindings--define-key menu [directory-search]
       '(menu-item "Directory Search" eudc-tools-menu))
     (bindings--define-key menu [compose-mail]
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)
diff --git a/lisp/startup.el b/lisp/startup.el
index bbcf5bda2d7..efa198482c2 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1742,6 +1742,7 @@ splash screen in another window."
         (insert "\n")
         (fancy-startup-tail concise))
       (use-local-map splash-screen-keymap)
+      (setq-local browse-url-browser-function 'eww-browse-url)
       (setq tab-width 22
             buffer-read-only t)
       (set-buffer-modified-p nil)
@@ -1779,6 +1780,7 @@ splash screen in another window."
         (goto-char (point-min))
         (force-mode-line-update))
       (use-local-map splash-screen-keymap)
+      (setq-local browse-url-browser-function 'eww-browse-url)
       (setq tab-width 22)
       (setq buffer-read-only t)
       (goto-char (point-min))