From: yoichi <yoichi>
Date: Mon, 11 Mar 2002 12:25:53 +0000 (+0000)
Subject: * wl-mule.el (wl-draft-overload-menubar): Taken from wl-e21.el.
X-Git-Tag: wl-2_9_8~2
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=c38abbb2c8c4c9868ffa918649198455e5919656;p=elisp%2Fwanderlust.git

* wl-mule.el (wl-draft-overload-menubar): Taken from wl-e21.el.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 3b05f10..8796a5d 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,5 +1,7 @@
 2002-03-11  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
 
+	* wl-mule.el (wl-draft-overload-menubar): Taken from wl-e21.el.
+
 	* wl-summary.el (wl-summary-write-current-folder): Call wl-draft
 	even if the guess failed.
 
diff --git a/wl/wl-mule.el b/wl/wl-mule.el
index 9bf61b4..d1d577a 100644
--- a/wl/wl-mule.el
+++ b/wl/wl-mule.el
@@ -162,22 +162,31 @@ Special commands:
   (define-key wl-draft-mode-map "\C-c\C-d" 'wl-draft-elide-region))
 
 (defun wl-draft-overload-menubar ()
-;  (local-set-key [menu-bar mail preview]
-;    '("Preview Message" . wl-draft-preview-message))
-  (local-set-key [menu-bar mail send]
-    '("Send Message" . wl-draft-send-and-exit))
-  (local-set-key [menu-bar mail send-stay]
-    '("Send, Keep Editing" . wl-draft-send))
-  (local-set-key [menu-bar mail cancel]
-    '("Kill Current Draft" . wl-draft-kill))
-;  (local-set-key [menu-bar mail save]
-;    '("Save Draft and Exit" . wl-draft-save-and-exit))
-  (local-set-key [menu-bar mail yank]
-    '("Cite Message" . wl-draft-yank-original))
-  (local-set-key [menu-bar mail signature]
-    '("Insert Signature" . insert-signature))
-  (local-set-key [menu-bar headers fcc]
-    '("Fcc" . wl-draft-fcc)))
+  (let ((keymap (current-local-map)))
+    (define-key keymap [menu-bar mail send]
+      '("Send Message" . wl-draft-send-and-exit))
+    (define-key keymap [menu-bar mail send-stay]
+      '("Send, Keep Editing" . wl-draft-send))
+    (define-key-after (lookup-key keymap [menu-bar mail])
+      [mail-sep-send] '("--")
+      'send-stay)
+    (define-key keymap [menu-bar mail cancel]
+      '("Kill Current Draft" . wl-draft-kill))
+    (define-key-after (lookup-key keymap [menu-bar mail])
+      [save] '("Save Draft and Exit" . wl-draft-save-and-exit)
+      'cancel)
+    (define-key-after (lookup-key keymap [menu-bar mail])
+      [mail-sep-exit] '("--")
+      'save)
+    (define-key-after (lookup-key keymap [menu-bar mail])
+      [preview] '("Preview Message" . wl-draft-preview-message)
+      'mail-sep-exit)
+    (define-key keymap [menu-bar mail yank]
+      '("Cite Message" . wl-draft-yank-original))
+    (define-key keymap [menu-bar mail signature]
+      '("Insert Signature" . insert-signature))
+    (define-key keymap [menu-bar headers fcc]
+      '("Fcc" . wl-draft-fcc))))
 
 (defun wl-draft-overload-functions ()
   (wl-mode-line-buffer-identification)