Merge from trunk:

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

diff --git a/wl/wl-mule.el b/wl/wl-mule.el
index d1d577a..985768d 100644 (file)
--- a/wl/wl-mule.el
+++ b/wl/wl-mule.el
@@ -100,6 +100,7 @@ Special commands:
 
 (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 [mouse-4] 'wl-message-wheel-down)
     (define-key keymap [mouse-5] 'wl-message-wheel-up)
@@ -112,7 +113,7 @@ Special commands:
 
 (defun wl-message-wheel-up (event)
   (interactive "e")
-  (if (string-match (regexp-quote wl-message-buffer-cache-name)
+  (if (string-match (regexp-quote wl-message-buffer-name)
                    (regexp-quote (buffer-name)))
       (wl-message-next-page)
     (let ((cur-buf (current-buffer))
@@ -128,7 +129,7 @@ Special commands:
 
 (defun wl-message-wheel-down (event)
   (interactive "e")
-  (if (string-match (regexp-quote wl-message-buffer-cache-name)
+  (if (string-match (regexp-quote wl-message-buffer-name)
                    (regexp-quote (buffer-name)))
       (wl-message-prev-page)
     (let ((cur-buf (current-buffer))
@@ -159,7 +160,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-menubar ()
   (let ((keymap (current-local-map)))