[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115574: * lisp/menu-bar.el (menu-bar-tools-menu): A
From: |
Juri Linkov |
Subject: |
[Emacs-diffs] trunk r115574: * lisp/menu-bar.el (menu-bar-tools-menu): Add `browse-web'. |
Date: |
Tue, 17 Dec 2013 21:17:09 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115574
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16178
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Tue 2013-12-17 23:17:05 +0200
message:
* 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)
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/menu-bar.el menubar.el-20091113204419-o5vbwnq5f7feedwu-546
lisp/net/browse-url.el
browseurl.el-20091113204419-o5vbwnq5f7feedwu-1785
lisp/net/eww.el eww.el-20130610114603-80ap3gwnw4x4m5ix-1
lisp/startup.el startup.el-20091113204419-o5vbwnq5f7feedwu-260
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-12-17 18:11:37 +0000
+++ b/lisp/ChangeLog 2013-12-17 21:17:05 +0000
@@ -1,3 +1,19 @@
+2013-12-17 Juri Linkov <address@hidden>
+
+ * 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 <address@hidden>
* window.el (window--pixel-to-total): Remove unused `mini' var.
=== modified file 'lisp/menu-bar.el'
--- a/lisp/menu-bar.el 2013-12-12 00:42:16 +0000
+++ b/lisp/menu-bar.el 2013-12-17 21:17:05 +0000
@@ -1418,6 +1418,8 @@
(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]
=== modified file 'lisp/net/browse-url.el'
--- a/lisp/net/browse-url.el 2013-12-03 12:21:13 +0000
+++ b/lisp/net/browse-url.el 2013-12-17 21:17:05 +0000
@@ -227,13 +227,13 @@
(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"
=== modified file 'lisp/net/eww.el'
--- a/lisp/net/eww.el 2013-12-16 23:40:17 +0000
+++ b/lisp/net/eww.el 2013-12-17 21:17:05 +0000
@@ -159,6 +159,8 @@
(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 @@
(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)
=== modified file 'lisp/startup.el'
--- a/lisp/startup.el 2013-12-09 17:33:01 +0000
+++ b/lisp/startup.el 2013-12-17 21:17:05 +0000
@@ -1742,6 +1742,7 @@
(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 @@
(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))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115574: * lisp/menu-bar.el (menu-bar-tools-menu): Add `browse-web'.,
Juri Linkov <=