Re: w3m-minor-mode

[TSUCHIYA Masatoshi <tsuchiya@xxxxxxxxxxxxxxxxxxxxxxx>]

というわけで，emacs-w3m の keymap 周辺の変更が錯綜していますが，
emacs-w3m の最新版用 mm-view.el のパッチです．

--- CVS/Base/mm-view.el	2002-10-21 10:11:21.000000000 +0900
+++ mm-view.el	2002-10-22 22:33:48.000000000 +0900
@@ -185,58 +185,6 @@
   "Local keymap for inlined text/html part rendered by emacs-w3m.  It will
 be different from `w3m-mode-map' to use in the article buffer.")
 
-(defvar mm-w3m-mode-command-alist
-  '((backward-char)
-    (describe-mode)
-    (forward-char)
-    (goto-line)
-    (next-line)
-    (previous-line)
-    (w3m-antenna)
-    (w3m-antenna-add-current-url)
-    (w3m-bookmark-add-current-url)
-    (w3m-bookmark-add-this-url)
-    (w3m-bookmark-view)
-    (w3m-close-window)
-    (w3m-copy-buffer)
-    (w3m-delete-buffer)
-    (w3m-dtree)
-    (w3m-edit-current-url)
-    (w3m-edit-this-url)
-    (w3m-gohome)
-    (w3m-goto-url)
-    (w3m-goto-url-new-session)
-    (w3m-history)
-    (w3m-history-restore-position)
-    (w3m-history-store-position)
-    (w3m-namazu)
-    (w3m-next-buffer)
-    (w3m-previous-buffer)
-    (w3m-quit)
-    (w3m-redisplay-with-charset)
-    (w3m-reload-this-page)
-    (w3m-scroll-down-or-previous-url)
-    (w3m-scroll-up-or-next-url)
-    (w3m-search)
-    (w3m-select-buffer)
-    (w3m-switch-buffer)
-    (w3m-view-header)
-    (w3m-view-parent-page)
-    (w3m-view-previous-page)
-    (w3m-view-source)
-    (w3m-weather))
-  "Alist of commands to use for emacs-w3m in the article buffer.  Each
-element looks like (FROM-COMMAND . TO-COMMAND); FROM-COMMAND should be
-registered in `w3m-mode-map' which will be substituted by TO-COMMAND
-in `mm-w3m-mode-map'.  If TO-COMMAND is nil, an article command key
-will not be substituted.")
-
-(defvar mm-w3m-mode-dont-bind-keys (list [up] [right] [left] [down])
-  "List of keys which should not be bound for the emacs-w3m commands.")
-
-(defvar mm-w3m-mode-ignored-keys (list [down-mouse-2])
-  "List of keys which should ignore.")
-
 (defvar mm-w3m-setup nil
   "Whether gnus-article-mode has been setup to use emacs-w3m.")
 
@@ -245,19 +193,9 @@
   (unless mm-w3m-setup
     (require 'w3m)
     (unless mm-w3m-mode-map
-      (setq mm-w3m-mode-map (copy-keymap w3m-mode-map))
-      (dolist (def mm-w3m-mode-command-alist)
-	(condition-case nil
-	    (substitute-key-definition (car def) (cdr def) mm-w3m-mode-map)
-	  (error)))
-      (dolist (key mm-w3m-mode-dont-bind-keys)
-	(condition-case nil
-	    (define-key mm-w3m-mode-map key nil)
-	  (error)))
-      (dolist (key mm-w3m-mode-ignored-keys)
-	(condition-case nil
-	    (define-key mm-w3m-mode-map key 'ignore)
-	  (error))))
+      (setq mm-w3m-mode-map (w3m-make-minor-mode-keymap))
+      (unless (eq 'keymap (car (gnus-local-map-property nil)))
+	(set-keymap-parent mm-w3m-mode-map gnus-article-mode-map)))
     (unless (assq 'gnus-article-mode w3m-cid-retrieve-function-alist)
       (push (cons 'gnus-article-mode 'mm-w3m-cid-retrieve)
 	    w3m-cid-retrieve-function-alist))
-- 
土屋 雅稔 ( TSUCHIYA Masatoshi )