From: yamaoka <yamaoka>
Date: Fri, 1 Feb 2002 12:33:57 +0000 (+0000)
Subject: Synch with Oort Gnus.
X-Git-Tag: t-gnus-6_15_6-01-quimby~80
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=305008eb5d09ce4ddee452818de587c793b92bce;p=elisp%2Fgnus.git-

Synch with Oort Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f7c3c7b..6ad8d28 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2002-02-01  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+	* mm-view.el (mm-w3m-mode-dont-bind-keys): New variable.
+	(mm-setup-w3m): Don't bind keys listed in the above.
+
+2002-02-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
 	* mm-view.el (mm-inline-text-html-render-with-w3m): Bind
 	`w3m-safe-url-regexp' with nil if `mm-inline-text-html-with-images'
 	is non-nil; bind `w3m-force-redisplay' with nil.
diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 0e45776..a0d4c45 100644
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -155,7 +155,7 @@
 
 (defvar mm-w3m-mode-map nil
   "Local keymap for inlined text/html part rendered by emacs-w3m.  It will
-be slightly different from `w3m-mode-map' to use in the article buffer.")
+be different from `w3m-mode-map' to use in the article buffer.")
 
 (defvar mm-w3m-mode-command-alist
   '((backward-char)
@@ -203,6 +203,9 @@ 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-setup nil
   "Whether gnus-article-mode has been setup to use emacs-w3m.")
 
@@ -215,6 +218,10 @@ will not be substituted.")
       (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))))
     (unless (assq 'gnus-article-mode w3m-cid-retrieve-function-alist)
       (push (cons 'gnus-article-mode 'mm-w3m-cid-retrieve)