X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=wl%2Fwl-e21.el;h=ffabf4a04f1421ad3bf31050a499fd542428be67;hb=8a81d3a3caef0f94f9721361a749f0b6429f30ce;hp=ce261d8b44ab3b75fa4f991b5fb47617efab126d;hpb=7488784d2b6c2612320920354ae9c976e16a0329;p=elisp%2Fwanderlust.git

diff --git a/wl/wl-e21.el b/wl/wl-e21.el
index ce261d8..ffabf4a 100644
--- a/wl/wl-e21.el
+++ b/wl/wl-e21.el
@@ -1,4 +1,4 @@
-;;; wl-e21.el -- Wanderlust modules for Emacs 21.
+;;; wl-e21.el --- Wanderlust modules for Emacs 21.
 
 ;; Copyright (C) 2000,2001 Katsumi Yamaoka <yamaoka@jpl.org>
 ;; Copyright (C) 2000,2001 Yuuichi Teranishi <teranisi@gohome.org>
@@ -33,7 +33,7 @@
 ;;(let (image icon from to overlay)
 ;;  ;; The function `find-image' will look for an image first on `load-path'
 ;;  ;; and then in `data-directory'.
-;;  (let ((load-path (cons wl-icon-dir load-path)))
+;;  (let ((load-path (cons wl-icon-directory load-path)))
 ;;    (setq image (find-image (list (list :type 'xpm :file wl-nntp-folder-icon
 ;;					:ascent 'center)))))
 ;;  ;; `propertize' is a convenient function in such a case.
@@ -54,17 +54,21 @@
 ;;  (overlay-put overlay 'wl-e21-icon t)
 ;;  ;; Make it to be removable.
 ;;  (overlay-put overlay 'evaporate t))
+;;
+;; Note that a port of Emacs to some platforms (e.g. MS-Windoze) does
+;; not yet support images.  It is a pity that neither icons nor tool-
+;; bars will not be displayed in such systems.
 
 ;;; Code:
 ;;
 
+(require 'elmo)
 (eval-when-compile
   (require 'wl-folder)
   (require 'wl-summary)
   (require 'wl-draft)
   (require 'wl-message)
   (require 'wl-highlight)
-  (defvar-maybe wl-folder-mode-map (make-sparse-keymap))
   (defvar-maybe wl-draft-mode-map (make-sparse-keymap)))
 
 (add-hook 'wl-folder-mode-hook 'wl-setup-folder)
@@ -75,6 +79,8 @@
 
 (add-hook 'wl-summary-mode-hook 'wl-setup-summary)
 
+(add-hook 'wl-message-display-internal-hook 'wl-setup-message)
+
 (defvar wl-use-toolbar (image-type-available-p 'xpm))
 (defvar wl-plugged-image nil)
 (defvar wl-unplugged-image nil)
@@ -90,12 +96,12 @@
      wl-folder-prev-entity t "Previous Folder"]
     [wl-folder-check-current-entity
      wl-folder-check-current-entity t "Check Current Folder"]
-    ;;[wl-draft
-    ;; wl-draft t "Write a New Message"]
     [wl-folder-sync-current-entity
      wl-folder-sync-current-entity t "Sync Current Folder"]
     [wl-draft
      wl-draft t "Write a New Message"]
+    [wl-folder-goto-draft-folder
+     wl-folder-goto-draft-folder t "Go to Draft Folder"]
     [wl-folder-empty-trash
      wl-folder-empty-trash t "Empty Trash"]
     [wl-exit
@@ -114,12 +120,12 @@
      wl-summary-jump-to-current-message t "Jump to Current Message"]
     [wl-summary-sync-force-update
      wl-summary-sync-force-update t "Sync Current Folder"]
-    [wl-summary-delete
-     wl-summary-delete t "Delete Current Message"]
-    [wl-summary-mark-as-important
-     wl-summary-mark-as-important t "Mark Current Message as Important"]
+    [wl-summary-dispose
+     wl-summary-dispose t "Dispose Current Message"]
+    [wl-summary-set-flags
+     wl-summary-set-flags t "Set Flags"]
     [wl-draft
-     wl-draft t "Write a New Message"]
+     wl-summary-write-current-folder t "Write for Current Folder"]
     [wl-summary-reply
      wl-summary-reply t "Reply to Current Message" ]
     [wl-summary-reply-with-citation
@@ -158,36 +164,45 @@
      wl-draft-insert-signature t "Insert Signature"]
     [wl-draft-kill
      wl-draft-kill t "Kill Current Draft"]
+    [wl-draft-save-and-exit
+     wl-draft-save-and-exit t "Save Draft and Exit"]
     )
   "The Draft buffer toolbar.")
 
+(eval-when-compile
+  (defmacro wl-e21-display-image-p ()
+    '(and (display-images-p)
+	  (image-type-available-p 'xpm))))
+
 (defun wl-e21-setup-toolbar (bar)
-  (let ((load-path (cons wl-icon-dir load-path))
-	(props '(:type xpm :ascent center
-		       :color-symbols (("backgroundToolBarColor" . "None"))
-		       :file))
-	(success t)
-	icon up down disabled name success)
-    (while bar
-      (setq icon (aref (pop bar) 0))
-      (unless (boundp icon)
-	(setq name (symbol-name icon)
-	      up (find-image `((,@props ,(concat name "-up.xpm")))))
-	(if up
-	    (progn
-	      (setq down (find-image `((,@props ,(concat name "-down.xpm"))))
-		    disabled (find-image `((,@props
-					    ,(concat name "-disabled.xpm")))))
-	      (set icon (vector down up disabled disabled)))
-	  (setq bar nil
-		success nil))))
-    success))
+  (when (and wl-use-toolbar
+	     (wl-e21-display-image-p))
+    (let ((load-path (cons wl-icon-directory load-path))
+	  (props '(:type xpm :ascent center
+			 :color-symbols (("backgroundToolBarColor" . "None"))
+			 :file))
+	  (success t)
+	  icon up down disabled name)
+      (while bar
+	(setq icon (aref (pop bar) 0))
+	(unless (boundp icon)
+	  (setq name (symbol-name icon)
+		up (find-image `((,@props ,(concat name "-up.xpm")))))
+	  (if up
+	      (progn
+		(setq down (find-image `((,@props ,(concat name "-down.xpm"))))
+		      disabled (find-image
+				`((,@props ,(concat name "-disabled.xpm")))))
+		(set icon (vector down up disabled disabled)))
+	    (setq bar nil
+		  success nil))))
+      success)))
 
 (defvar wl-e21-toolbar-configurations
-  '((auto-resize-tool-bar        . t)
+  '((auto-resize-tool-bars       . t)
     (auto-raise-tool-bar-buttons . t)
-    (tool-bar-button-margin      . 0)
-    (tool-bar-button-relief      . 2)))
+    (tool-bar-button-margin      . 2)
+    (tool-bar-button-relief      . 1)))
 
 (defun wl-e21-make-toolbar-buttons (keymap defs)
   (let ((configs wl-e21-toolbar-configurations)
@@ -211,29 +226,21 @@
 	      :image (symbol-value (aref def 0)))))))
 
 (defun wl-e21-setup-folder-toolbar ()
-  (and wl-use-toolbar
-       (display-graphic-p)
-       (wl-e21-setup-toolbar wl-folder-toolbar)
-       (wl-e21-make-toolbar-buttons wl-folder-mode-map wl-folder-toolbar)))
+  (when (wl-e21-setup-toolbar wl-folder-toolbar)
+    (wl-e21-make-toolbar-buttons wl-folder-mode-map wl-folder-toolbar)))
 
 (defun wl-e21-setup-summary-toolbar ()
-  (and wl-use-toolbar
-       (display-graphic-p)
-       (wl-e21-setup-toolbar wl-summary-toolbar)
-       (wl-e21-make-toolbar-buttons wl-summary-mode-map wl-summary-toolbar)))
+  (when (wl-e21-setup-toolbar wl-summary-toolbar)
+    (wl-e21-make-toolbar-buttons wl-summary-mode-map wl-summary-toolbar)))
 
 (eval-when-compile
-  (defsubst wl-e21-setup-message-toolbar (keymap)
-    (and wl-use-toolbar
-	 (display-graphic-p)
-	 (wl-e21-setup-toolbar wl-message-toolbar)
-	 (wl-e21-make-toolbar-buttons keymap wl-message-toolbar)))
-
   (defsubst wl-e21-setup-draft-toolbar ()
-    (and wl-use-toolbar
-	 (display-graphic-p)
-	 (wl-e21-setup-toolbar wl-draft-toolbar)
-	 (wl-e21-make-toolbar-buttons wl-draft-mode-map wl-draft-toolbar))))
+    (when (wl-e21-setup-toolbar wl-draft-toolbar)
+      (wl-e21-make-toolbar-buttons wl-draft-mode-map wl-draft-toolbar))))
+
+(defun wl-e21-setup-message-toolbar ()
+  (when (wl-e21-setup-toolbar wl-message-toolbar)
+    (wl-e21-make-toolbar-buttons (current-local-map) wl-message-toolbar)))
 
 (defvar wl-folder-toggle-icon-list
   '((wl-folder-opened-image       . wl-opened-group-folder-icon)
@@ -241,7 +248,7 @@
 
 (eval-when-compile
   (defsubst wl-e21-highlight-folder-group-line (start end icon numbers)
-    (when (display-graphic-p)
+    (when (wl-e21-display-image-p)
       (let (overlay)
 	(let ((overlays (overlays-in start end)))
 	  (while (and (setq overlay (pop overlays))
@@ -254,7 +261,7 @@
 	  (unless image
 	    (let ((name (symbol-value
 			 (cdr (assq icon wl-folder-toggle-icon-list))))
-		  (load-path (cons wl-icon-dir load-path)))
+		  (load-path (cons wl-icon-directory load-path)))
 	      (when (setq image (find-image `((:type xpm :file ,name
 						     :ascent center))))
 		(setq image (put icon 'image (propertize name
@@ -274,7 +281,7 @@
       (let ((inhibit-read-only t))
 	(if (and wl-highlight-folder-by-numbers
 		 numbers (nth 0 numbers) (nth 1 numbers)
-		 (re-search-forward "[0-9-]+/[0-9-]+/[0-9-]+"
+		 (re-search-forward "[-[:digit:]]+/[-[:digit:]]+/[-[:digit:]]+"
 				    (line-end-position) t))
 	    (let* ((unsync (nth 0 numbers))
 		   (unread (nth 1 numbers))
@@ -304,7 +311,8 @@
     (let (fld-name start end)
       (cond
        (;; opened folder group
-	(looking-at wl-highlight-folder-opened-regexp)
+	(and (wl-folder-buffer-group-p)
+	     (looking-at wl-highlight-folder-opened-regexp))
 	(setq start (match-beginning 1)
 	      end (match-end 1))
 	(wl-e21-highlight-folder-group-line start end
@@ -314,7 +322,8 @@
 					    'wl-highlight-folder-opened-face
 					    numbers))
        (;; closed folder group
-	(looking-at wl-highlight-folder-closed-regexp)
+	(and (wl-folder-buffer-group-p)
+	     (looking-at wl-highlight-folder-closed-regexp))
 	(setq start (match-beginning 1)
 	      end (match-end 1))
 	(wl-e21-highlight-folder-group-line start end
@@ -326,11 +335,11 @@
        (;; basic folder
 	(and (setq fld-name (wl-folder-get-folder-name-by-id
 			     (get-text-property (point) 'wl-folder-entity-id)))
-	     (looking-at "[\t ]+\\([^\t\n ]+\\)"))
+	     (looking-at "[[:blank:]]+\\([^[:blank:]\n]+\\)"))
 	(setq start (match-beginning 1)
 	      end (match-end 1))
 	(let (image)
-	  (when (display-graphic-p)
+	  (when (wl-e21-display-image-p)
 	    (let (overlay)
 	      (let ((overlays (overlays-in start end)))
 		(while (and (setq overlay (pop overlays))
@@ -340,6 +349,8 @@
 		(overlay-put overlay 'wl-e21-icon t)
 		(overlay-put overlay 'evaporate t))
 	      (let (type)
+		(unless (get (caar wl-folder-internal-icon-list) 'image)
+		  (wl-folder-init-icons))
 		(setq image
 		      (cond ((string= fld-name wl-trash-folder);; trash folder
 			     (let ((num (nth 2 numbers)));; number of messages
@@ -352,7 +363,9 @@
 			    ((string= fld-name wl-queue-folder);; queue folder
 			     (get 'wl-folder-queue-image 'image))
 			    (;; and one of many other folders
-			     (setq type (elmo-folder-get-type fld-name))
+			     (setq type (or (elmo-folder-type fld-name)
+					    (elmo-folder-type-internal
+					     (elmo-make-folder fld-name))))
 			     (get (intern (format "wl-folder-%s-image" type))
 				  'image)))))
 	      (overlay-put overlay 'before-string image)))
@@ -367,7 +380,7 @@
 	(when (display-color-p)
 	  (wl-e21-highlight-folder-by-numbers
 	   start end
-	   (if (looking-at (format "^[\t ]*\\(%s\\|%s\\)"
+	   (if (looking-at (format "^[[:blank:]]*\\(?:%s\\|%s\\)"
 				   wl-folder-unsubscribe-mark
 				   wl-folder-removed-mark))
 	       'wl-highlight-folder-killed-face
@@ -376,10 +389,10 @@
 
 (defun wl-highlight-plugged-current-line ()
   (interactive)
-  (when (display-graphic-p)
+  (when (wl-e21-display-image-p)
     (save-excursion
       (beginning-of-line)
-      (when (looking-at "[\t ]*\\(\\[\\([^]]+\\)\\]\\)")
+      (when (looking-at "[[:blank:]]*\\(\\[\\([^]]+\\)\\]\\)")
 	(let* ((start (match-beginning 1))
 	       (end (match-end 1))
 	       (status (match-string-no-properties 2))
@@ -400,17 +413,15 @@
 	      (overlay-put overlay 'invisible t))))))))
 
 (defun wl-plugged-set-folder-icon (folder string)
-  (if (display-graphic-p)
+  (if (wl-e21-display-image-p)
       (let (type)
 	(cond ((string= folder wl-queue-folder)
-	       (concat (propertize " " 'display
-				   (get 'wl-folder-queue-image 'image))
+	       (concat (get 'wl-folder-queue-image 'image)
 		       string))
-	      ((setq type (elmo-folder-get-type folder))
-	       (concat (propertize " " 'display
-				   (get (intern (format "wl-folder-%s-image"
-							type))
-					'image))
+	      ((setq type (elmo-folder-type folder))
+	       (concat (get (intern (format "wl-folder-%s-image"
+					    type))
+			    'image)
 		       string))
 	      (t
 	       string)))
@@ -418,25 +429,28 @@
 
 (defvar wl-folder-internal-icon-list
   ;; alist of (image . icon-file)
-  '((wl-folder-nntp-image         . wl-nntp-folder-icon)
-    (wl-folder-imap4-image        . wl-imap-folder-icon)
-    (wl-folder-pop3-image         . wl-pop-folder-icon)
+  '((wl-folder-nntp-image	  . wl-nntp-folder-icon)
+    (wl-folder-imap4-image	  . wl-imap-folder-icon)
+    (wl-folder-pop3-image	  . wl-pop-folder-icon)
     (wl-folder-localdir-image     . wl-localdir-folder-icon)
     (wl-folder-localnews-image    . wl-localnews-folder-icon)
     (wl-folder-internal-image     . wl-internal-folder-icon)
-    (wl-folder-multi-image        . wl-multi-folder-icon)
+    (wl-folder-multi-image	  . wl-multi-folder-icon)
     (wl-folder-filter-image       . wl-filter-folder-icon)
     (wl-folder-archive-image      . wl-archive-folder-icon)
-    (wl-folder-pipe-image         . wl-pipe-folder-icon)
+    (wl-folder-pipe-image	  . wl-pipe-folder-icon)
     (wl-folder-maildir-image      . wl-maildir-folder-icon)
+    (wl-folder-nmz-image	  . wl-nmz-folder-icon)
+    (wl-folder-shimbun-image      . wl-shimbun-folder-icon)
+    (wl-folder-file-image	  . wl-file-folder-icon)
     (wl-folder-trash-empty-image  . wl-empty-trash-folder-icon)
-    (wl-folder-draft-image        . wl-draft-folder-icon)
-    (wl-folder-queue-image        . wl-queue-folder-icon)
-    (wl-folder-trash-image        . wl-trash-folder-icon)))
+    (wl-folder-draft-image	  . wl-draft-folder-icon)
+    (wl-folder-queue-image	  . wl-queue-folder-icon)
+    (wl-folder-trash-image	  . wl-trash-folder-icon)))
 
 (defun wl-folder-init-icons ()
-  (when (display-graphic-p)
-    (let ((load-path (cons wl-icon-dir load-path))
+  (when (wl-e21-display-image-p)
+    (let ((load-path (cons wl-icon-directory load-path))
 	  (icons wl-folder-internal-icon-list)
 	  icon name image)
       (while (setq icon (pop icons))
@@ -447,67 +461,66 @@
 	    (put (car icon) 'image (propertize name 'display image))))))))
 
 (defun wl-plugged-init-icons ()
-  (if (display-mouse-p)
-      (let ((props (list 'local-map (purecopy (make-mode-line-mouse2-map
-					       #'wl-toggle-plugged))
-			 'help-echo "mouse-2 toggles plugged status")))
-	(if (display-graphic-p)
-	    (progn
-	      (unless wl-plugged-image
-		(let ((load-path (cons wl-icon-dir load-path)))
-		  (setq wl-plugged-image (find-image
-					  `((:type xpm
-						   :file ,wl-plugged-icon
-						   :ascent center)))
-			wl-unplugged-image (find-image
-					    `((:type xpm
-						     :file ,wl-unplugged-icon
-						     :ascent center))))))
-	      (setq wl-modeline-plug-state-on
-		    (apply 'propertize wl-plug-state-indicator-on
-			   `(display ,wl-plugged-image ,@props))
-		    wl-modeline-plug-state-off
-		    (apply 'propertize wl-plug-state-indicator-off
-			   `(display ,wl-unplugged-image ,@props))))
+  (let ((props (when (display-mouse-p)
+		 (list 'local-map (purecopy (make-mode-line-mouse-map
+					     'mouse-2 #'wl-toggle-plugged))
+		       'help-echo "mouse-2 toggles plugged status"))))
+    (if (wl-e21-display-image-p)
+	(progn
+	  (unless wl-plugged-image
+	    (let ((load-path (cons wl-icon-directory load-path)))
+	      (setq wl-plugged-image (find-image
+				      `((:type xpm
+					       :file ,wl-plugged-icon
+					       :ascent center)))
+		    wl-unplugged-image (find-image
+					`((:type xpm
+						 :file ,wl-unplugged-icon
+						 :ascent center))))))
+	  (setq wl-modeline-plug-state-on
+		(apply 'propertize wl-plug-state-indicator-on
+		       `(display ,wl-plugged-image ,@props))
+		wl-modeline-plug-state-off
+		(apply 'propertize wl-plug-state-indicator-off
+		       `(display ,wl-unplugged-image ,@props))))
+      (if props
 	  (setq wl-modeline-plug-state-on
 		(apply 'propertize wl-plug-state-indicator-on props)
 		wl-modeline-plug-state-off
-		(apply 'propertize wl-plug-state-indicator-off props))))
-    (setq wl-modeline-plug-state-on wl-plug-state-indicator-on
-	  wl-modeline-plug-state-off wl-plug-state-indicator-off)))
+		(apply 'propertize wl-plug-state-indicator-off props))
+	(setq wl-modeline-plug-state-on wl-plug-state-indicator-on
+	      wl-modeline-plug-state-off wl-plug-state-indicator-off)))))
 
 (defun wl-biff-init-icons ()
-  (if (display-mouse-p)
-      (let ((props (list 'local-map (purecopy (make-mode-line-mouse2-map
-					       (lambda nil
-						 (call-interactively
-						  'wl-biff-check-folders))))
-			 'help-echo "mouse-2 checks new mails")))
-	(if (display-graphic-p)
-	    (progn
-	      (unless wl-biff-mail-image
-		(let ((load-path (cons wl-icon-dir load-path)))
-		  (setq wl-biff-mail-image (find-image
-					    `((:type xpm
-						     :file ,wl-biff-mail-icon
-						     :ascent center)))
-			wl-biff-nomail-image (find-image
-					      `((:type xpm
-						       :file
-						       ,wl-biff-nomail-icon
-						       :ascent center))))))
-	      (setq wl-modeline-biff-state-on
-		    (apply 'propertize wl-biff-state-indicator-on
-			   `(display ,wl-biff-mail-image ,@props))
-		    wl-modeline-biff-state-off
-		    (apply 'propertize wl-biff-state-indicator-off
-			   `(display ,wl-biff-nomail-image ,@props))))
+  (let ((props (when (display-mouse-p)
+		 (list 'local-map (purecopy (make-mode-line-mouse-map
+					     'mouse-2 #'wl-biff-check-folders))
+		       'help-echo "mouse-2 checks new mails"))))
+    (if (wl-e21-display-image-p)
+	(progn
+	  (unless wl-biff-mail-image
+	    (let ((load-path (cons wl-icon-directory load-path)))
+	      (setq wl-biff-mail-image (find-image
+					`((:type xpm
+						 :file ,wl-biff-mail-icon
+						 :ascent center)))
+		    wl-biff-nomail-image (find-image
+					  `((:type xpm
+						   :file ,wl-biff-nomail-icon
+						   :ascent center))))))
+	  (setq wl-modeline-biff-state-on
+		(apply 'propertize wl-biff-state-indicator-on
+		       `(display ,wl-biff-mail-image ,@props))
+		wl-modeline-biff-state-off
+		(apply 'propertize wl-biff-state-indicator-off
+		       `(display ,wl-biff-nomail-image ,@props))))
+      (if props
 	  (setq wl-modeline-biff-state-on
 		(apply 'propertize wl-biff-state-indicator-on props)
 		wl-modeline-biff-state-off
-		(apply 'propertize wl-biff-state-indicator-off props))))
-    (setq wl-modeline-biff-state-on wl-biff-state-indicator-on
-	  wl-modeline-biff-state-off wl-biff-state-indicator-off)))
+		(apply 'propertize wl-biff-state-indicator-off props))
+	(setq wl-modeline-biff-state-on wl-biff-state-indicator-on
+	      wl-modeline-biff-state-off wl-biff-state-indicator-off)))))
 
 (defun wl-make-date-string ()
   (let ((system-time-locale "C"))
@@ -517,23 +530,47 @@
 
 (defalias 'wl-setup-summary 'wl-e21-setup-summary-toolbar)
 
-(defun wl-message-overload-functions ()
-  (let ((keymap (current-local-map)))
-    (when keymap
-      (wl-e21-setup-message-toolbar keymap)
-      (define-key keymap "l" 'wl-message-toggle-disp-summary)
-      (define-key keymap [mouse-2] 'wl-message-refer-article-or-url)
-      (define-key keymap [mouse-4] 'wl-message-wheel-down)
-      (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)
-      (set-keymap-parent wl-message-button-map keymap)
-      (define-key wl-message-button-map
-	[mouse-2] 'wl-message-button-dispatcher))))
+(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 "\C-c:d" 'wl-message-decrypt-pgp-nonmime)
+    (define-key keymap "\C-c:v" 'wl-message-verify-pgp-nonmime)
+    (define-key keymap [mouse-4] 'wl-message-wheel-down)
+    (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)
+    ;; Meadow2
+    (define-key keymap [mouse-wheel1] 'wl-message-wheel-dispatcher)
+    (define-key keymap [S-mouse-wheel1] 'wl-message-wheel-dispatcher)
+    (set-keymap-parent wl-message-button-map keymap)
+    (define-key wl-message-button-map
+      [mouse-2] 'wl-message-button-dispatcher)
+    keymap))
+
+(defalias 'wl-setup-message 'wl-e21-setup-message-toolbar)
+
+;; Wheel handling for Meadow2
+(defun wl-message-wheel-dispatcher (event)
+  (interactive "e")
+  (if (< (nth 4 (nth 1 event)) 0)
+      (wl-message-wheel-up event)
+    (wl-message-wheel-down event)))
+
+(defun wl-summary-wheel-dispatcher (event)
+  (interactive "e")
+  (if (< (nth 4 (nth 1 event)) 0)
+      (if (memq 'shift (event-modifiers event))
+	  (wl-summary-down)
+	(wl-summary-next))
+    (if (memq 'shift (event-modifiers event))
+	(wl-summary-up)
+      (wl-summary-prev))))
 
 (defun wl-message-wheel-up (event)
   (interactive "e")
-  (if (string-match wl-message-buf-name (buffer-name))
+  (if (string-match (regexp-quote wl-message-buffer-name)
+		    (regexp-quote (buffer-name)))
       (wl-message-next-page)
     (let ((cur-buf (current-buffer))
 	  proceed)
@@ -548,7 +585,8 @@
 
 (defun wl-message-wheel-down (event)
   (interactive "e")
-  (if (string-match wl-message-buf-name (buffer-name))
+  (if (string-match (regexp-quote wl-message-buffer-name)
+		    (regexp-quote (buffer-name)))
       (wl-message-prev-page)
     (let ((cur-buf (current-buffer))
 	  proceed)
@@ -567,14 +605,26 @@
       '("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))))
+      '("Fcc" . wl-draft-fcc))))
 
 (defun wl-draft-mode-setup ()
   (require 'derived)
@@ -588,7 +638,6 @@ Special commands:
 (defun wl-draft-key-setup ()
   (define-key wl-draft-mode-map "\C-c\C-y" 'wl-draft-yank-original)
   (define-key wl-draft-mode-map "\C-c\C-s" 'wl-draft-send)
-  (define-key wl-draft-mode-map "\C-c\C-a" 'wl-draft-insert-x-face-field)
   (define-key wl-draft-mode-map "\C-c\C-c" 'wl-draft-send-and-exit)
   (define-key wl-draft-mode-map "\C-c\C-z" 'wl-draft-save-and-exit)
   (define-key wl-draft-mode-map "\C-c\C-k" 'wl-draft-kill)
@@ -600,12 +649,17 @@ Special commands:
   (define-key wl-draft-mode-map "\C-c\C-e" 'wl-draft-config-exec)
   (define-key wl-draft-mode-map "\C-c\C-j" 'wl-template-select)
   (define-key wl-draft-mode-map "\C-c\C-p" 'wl-draft-preview-message)
-  (define-key wl-draft-mode-map "\C-x\C-s" 'wl-draft-save)
-  (define-key wl-draft-mode-map "\C-xk"    'wl-draft-mimic-kill-buffer))
+  (define-key wl-draft-mode-map "\C-c\C-a" 'wl-addrmgr)
+;;  (define-key wl-draft-mode-map "\C-x\C-s" 'wl-draft-save)
+  (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-a" 'wl-draft-beginning-of-line)
+  (define-key wl-draft-mode-map "\M-p" 'wl-draft-previous-history-element)
+  (define-key wl-draft-mode-map "\M-n" 'wl-draft-next-history-element))
 
 (defun wl-draft-overload-functions ()
   (wl-mode-line-buffer-identification)
-  (local-set-key "\C-c\C-s" 'wl-draft-send);; override
+;;  (local-set-key "\C-c\C-s" 'wl-draft-send);; override
   (wl-e21-setup-draft-toolbar)
   (wl-draft-overload-menubar))
 
@@ -616,6 +670,13 @@ Special commands:
   (let ((event (read-event)))
     (cons (and (numberp event) event) event)))
 
+(defalias 'wl-completing-read-multiple 'completing-read-multiple)
+
+(put 'wl-modeline-biff-state-on 'risky-local-variable t)
+(put 'wl-modeline-biff-state-off 'risky-local-variable t)
+(put 'wl-modeline-plug-state-on 'risky-local-variable t)
+(put 'wl-modeline-plug-state-off 'risky-local-variable t)
+
 (require 'product)
 (product-provide (provide 'wl-e21) (require 'wl-version))