From: teranisi <teranisi>
Date: Tue, 2 Oct 2001 03:58:09 +0000 (+0000)
Subject: * wl-e21.el (wl-message-define-keymap): Don't set widget-keymap as parent.
X-Git-Tag: wl-2_7_5~21
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=822563936c5f818c1ab6f7ed9c26f52d7abc6bf5;p=elisp%2Fwanderlust.git

* wl-e21.el (wl-message-define-keymap): Don't set widget-keymap as parent.

* wl-mule.el (wl-message-define-keymap): Ditto.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 6793b28..124e76e 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,5 +1,10 @@
 2001-10-02  Yuuichi Teranishi  <teranisi@gohome.org>
 
+	* wl-e21.el (wl-message-define-keymap): Don't set widget-keymap as
+	parent.
+
+	* wl-mule.el (wl-message-define-keymap): Ditto.
+
 	* wl-xmas.el (wl-message-define-keymap): Fixed parenthesis.
 
 	* wl-xmas.el (wl-message-display-internal-hook): Define.
diff --git a/wl/wl-e21.el b/wl/wl-e21.el
index cc48f90..4a40e12 100644
--- a/wl/wl-e21.el
+++ b/wl/wl-e21.el
@@ -536,7 +536,6 @@ corresponding to the mode line clicked."
 
 (defalias 'wl-setup-summary 'wl-e21-setup-summary-toolbar)
 
-(defvar widget-keymap)
 (defun wl-message-define-keymap ()
   (let ((keymap (make-sparse-keymap)))
     (define-key keymap "l" 'wl-message-toggle-disp-summary)
@@ -544,9 +543,6 @@ corresponding to the mode line clicked."
     (define-key keymap [mouse-5] 'wl-message-wheel-up)
     (define-key keymap [S-mouse-4] 'wl-message-wheel-down)
     (define-key keymap [S-mouse-5] 'wl-message-wheel-up)
-    (when (and (get 'mime-button 'widget-type) ; mime-button is defined.
-	       (boundp 'widget-keymap))
-      (set-keymap-parent keymap widget-keymap))
     (set-keymap-parent wl-message-button-map keymap)
     (define-key wl-message-button-map
       [mouse-2] 'wl-message-button-dispatcher)
diff --git a/wl/wl-mule.el b/wl/wl-mule.el
index 045c983..4ee73df 100644
--- a/wl/wl-mule.el
+++ b/wl/wl-mule.el
@@ -99,7 +99,6 @@ Special commands:
 (defun wl-plugged-set-folder-icon (folder string)
   string)
 
-(defvar widget-keymap)
 (defun wl-message-define-keymap ()
   (let ((keymap (make-sparse-keymap)))
     (define-key keymap "l" 'wl-message-toggle-disp-summary)
@@ -107,11 +106,7 @@ Special commands:
     (define-key keymap [mouse-5] 'wl-message-wheel-up)
     (define-key keymap [S-mouse-4] 'wl-message-wheel-down)
     (define-key keymap [S-mouse-5] 'wl-message-wheel-up)
-    (when (fboundp 'set-keymap-parent)
-      (when (and (get 'mime-button 'widget-type) ; mime-button is defined.
-		 (boundp 'widget-keymap))
-	(set-keymap-parent keymap widget-keymap))    
-      (set-keymap-parent wl-message-button-map keymap))
+    (set-keymap-parent wl-message-button-map keymap)
     (define-key wl-message-button-map [mouse-2]
       'wl-message-button-dispatcher))