Menu

["Masatake YAMATO" <masata-y@xxxxxxxxxxxxxxxxxx>]

大和です．

せっかくtoolbarがあるのですが，表示させてないので使えません．
;; そりゃそうだ．

menubarは出しているので，良く使う機能をmenuにつっこんでみました．
どんなもんでしょうか．

あと報告なのですが，M-x describe-modeとやってもhistoryに関連するキーバ
インドが出てきません．そのせいでいままでhistory機能を使ったことがなかっ
たのですが...すごいですね．感動しました．是非describe-modeとやったときに
表示するように変更して欲しいです．

2001-05-03  Masatake YAMATO  <jet@gyve.org>

	* w3m.el (w3m-mode): Call w3m-setup-menu.

	* w3m-xmas.el (w3m-setup-menu): New stub.

	* w3m-e21.el (w3m-setup-menu): New function.

Index: w3m-e21.el
===================================================================
RCS file: /storage/cvsroot/emacs-w3m/w3m-e21.el,v
retrieving revision 1.6
diff -u -r1.6 w3m-e21.el
--- w3m-e21.el	2001/04/17 07:24:10	1.6
+++ w3m-e21.el	2001/05/02 16:19:40
@@ -128,6 +128,34 @@
     (w3m-e21-make-toolbar-buttons w3m-toolbar-buttons)
     (w3m-e21-setup-toolbar w3m-mode-map w3m-toolbar)))
 
+;;; Menu
+(defun w3m-setup-menu ()
+  (let ((map (make-sparse-keymap "W3M")))
+  (define-key w3m-mode-map [menu-bar] (make-sparse-keymap))
+  (define-key w3m-mode-map [menu-bar w3m] (cons "W3M" map))
+  (define-key map [w3m-copy-buffer]
+    '("Copy Buffer" . w3m-copy-buffer))
+  (define-key map [w3m-bookmark-view]
+    '("View Bookmark" . w3m-bookmark-view))
+  (define-key map [w3m-history]
+    '("View History" . w3m-history))
+  (define-key map [w3m-print-current-url]
+    '("Print Current URL" . w3m-print-current-url))
+  (define-key map [w3m-download-this-url]
+    '("Download This URL" . w3m-download-this-url))
+  (define-key map [w3m-view-parent-page]
+    '("Upward to Parent Page" . w3m-view-parent-page))
+  (define-key map [w3m-view-next-page]
+    '("Forward to Next Page" . w3m-view-next-page))
+  (define-key map [w3m-view-previous-page]
+    '("Back to previous page" . w3m-view-previous-page))
+  (define-key map [w3m-reload-this-page]
+  '("Reload This Page" . w3m-reload-this-page))
+  (define-key map [w3m-goto-url]
+    '("Go to..." . w3m-goto-url))
+  ;; (define-key map [separator-eval] '("--"))
+  ))
+
 ;;; Header line
 (defface w3m-header-line-location-title-face
   '((((class color) (background light)) (:foreground "Blue"))

Index: w3m-xmas.el
===================================================================
RCS file: /storage/cvsroot/emacs-w3m/w3m-xmas.el,v
retrieving revision 1.15
diff -u -r1.15 w3m-xmas.el
--- w3m-xmas.el	2001/04/23 10:47:02	1.15
+++ w3m-xmas.el	2001/05/02 16:19:45
@@ -119,6 +119,11 @@
     (set-specifier default-toolbar
 		   (cons (current-buffer) w3m-toolbar))))
 
+;;; Menu
+(defun w3m-setup-menu ()
+  ;; TODO
+  )
+
 ;;; Widget:
 (eval-when-compile (require 'wid-edit))
 
Index: w3m.el
===================================================================
RCS file: /storage/cvsroot/emacs-w3m/w3m.el,v
retrieving revision 1.229
diff -u -r1.229 w3m.el
--- w3m.el	2001/04/27 02:31:24	1.229
+++ w3m.el	2001/05/02 16:19:55
@@ -1142,6 +1142,8 @@
       nil))
   (unless (fboundp 'w3m-setup-toolbar)
     (defun w3m-setup-toolbar ()))
+  (unless (fboundp 'w3m-setup-menu)
+    (defun w3m-setup-menu ()))
   (unless (fboundp 'w3m-update-toolbar)
     (defun w3m-update-toolbar ())))
 
@@ -2454,6 +2458,7 @@
   (use-local-map w3m-mode-map)
   (setq truncate-lines t)
   (w3m-setup-toolbar)
+  (w3m-setup-menu)
   (run-hooks 'w3m-mode-hook))
 
 (defun w3m-scroll-left (arg)