Update to version 2003-01-27.08.

[elisp/wanderlust.git] / wl / wl-xmas.el

diff --git a/wl/wl-xmas.el b/wl/wl-xmas.el
index 445d12e..93da3a2 100644 (file)
--- a/wl/wl-xmas.el
+++ b/wl/wl-xmas.el
@@ -69,8 +69,6 @@
      wl-folder-sync-current-entity t "Sync Current Folder"]
     [wl-draft
      wl-draft t "Write a New Message"]
-    [wl-write-current-folder
-     wl-folder-write-current-folder t "Write for Current Folder"]
     [wl-folder-goto-draft-folder
      wl-folder-goto-draft-folder t "Go to Draft Folder"]
     [wl-folder-empty-trash
@@ -96,8 +94,6 @@
     [wl-summary-mark-as-important
      wl-summary-mark-as-important t "Mark Current Message as Important"]
     [wl-draft
-     wl-draft t "Write a New Message"]
-    [wl-write-current-folder
      wl-summary-write-current-folder t "Write for Current Folder"]
     [wl-summary-reply
      wl-summary-reply t "Reply to Current Message" ]
@@ -450,6 +446,7 @@
 
 (defun wl-message-define-keymap ()
   (let ((keymap (make-sparse-keymap)))
+    (define-key keymap "D" 'wl-message-delete-current-part)
     (define-key keymap "l" 'wl-message-toggle-disp-summary)
     (define-key keymap 'button4 'wl-message-wheel-down)
     (define-key keymap 'button5 'wl-message-wheel-up)
@@ -462,42 +459,51 @@
 
 (defun wl-message-wheel-up (event)
   (interactive "e")
-  (let ((cur-buf (current-buffer))
-       proceed)
-    (save-selected-window
-      (select-window (event-window event))
-      (set-buffer cur-buf)
-      (setq proceed (wl-message-next-page)))
-    (when proceed
-      (if (memq 'shift (event-modifiers event))
-         (wl-summary-down t)
-       (wl-summary-next t)))))
+  (if (string-match (regexp-quote wl-message-buffer-name)
+                   (regexp-quote (buffer-name)))
+      (wl-message-prev-page)
+    (let ((cur-buf (current-buffer))
+         proceed)
+      (save-selected-window
+       (select-window (event-window event))
+       (set-buffer cur-buf)
+       (setq proceed (wl-message-next-page)))
+      (when proceed
+       (if (memq 'shift (event-modifiers event))
+           (wl-summary-down t)
+         (wl-summary-next t))))))
 
 (defun wl-message-wheel-down (event)
   (interactive "e")
-  (let ((cur-buf (current-buffer))
-       proceed)
-    (save-selected-window
-      (select-window (event-window event))
-      (set-buffer cur-buf)
-      (setq proceed (wl-message-prev-page)))
-    (when proceed
-      (if (memq 'shift (event-modifiers event))
-         (wl-summary-up t)
-       (wl-summary-prev t)))))
+  (if (string-match (regexp-quote wl-message-buffer-name)
+                   (regexp-quote (buffer-name)))
+      (wl-message-prev-page)
+    (let ((cur-buf (current-buffer))
+         proceed)
+      (save-selected-window
+       (select-window (event-window event))
+       (set-buffer cur-buf)
+       (setq proceed (wl-message-prev-page)))
+      (when proceed
+       (if (memq 'shift (event-modifiers event))
+           (wl-summary-up t)
+         (wl-summary-prev t))))))
 
 (defun wl-draft-overload-menubar ()
   (when (featurep 'menubar)
-    (add-menu-item '("Mail") "Preview Message"
-                  'wl-draft-preview-message t "Preview Message")
     (add-menu-item '("Mail") "Send, Keep Editing"
                   'wl-draft-send t "Send Mail")
     (add-menu-item '("Mail") "Send Message"
                   'wl-draft-send-and-exit t "Send and Exit")
-    (add-menu-item '("Mail") "Save Draft and Exit"
-                  'wl-draft-save-and-exit t "Save Draft and Exit")
     (delete-menu-item '("Mail" "Send Mail"))
-    (delete-menu-item '("Mail" "Send and Exit"))))
+    (delete-menu-item '("Mail" "Send and Exit"))
+    (add-menu-item '("Mail") "Preview Message"
+                  'wl-draft-preview-message t "Cancel")
+    (add-menu-item '("Mail") "Save Draft and Exit"
+                  'wl-draft-save-and-exit t "Cancel")
+    (add-menu-item '("Mail") "Kill Current Draft"
+                  'wl-draft-kill t "Cancel")
+    (delete-menu-item '("Mail" "Cancel"))))
 
 (defun wl-draft-mode-setup ()
   (require 'derived)
@@ -525,7 +531,8 @@ Special commands:
 ;;   (define-key wl-draft-mode-map "\C-x\C-s" 'wl-draft-save)
   (define-key wl-draft-mode-map "\C-c\C-a" 'wl-addrmgr)
   (define-key wl-draft-mode-map "\C-xk"    'wl-draft-mimic-kill-buffer)
-  (define-key wl-draft-mode-map "\C-c\C-d" 'wl-draft-elide-region))
+  (define-key wl-draft-mode-map "\C-c\C-d" 'wl-draft-elide-region)
+  (define-key wl-draft-mode-map "\C-a" 'wl-draft-beginning-of-line))
 
 (defun wl-draft-overload-functions ()
   (wl-mode-line-buffer-identification)