X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=wl%2Fwl-e21.el;h=ffabf4a04f1421ad3bf31050a499fd542428be67;hb=8a81d3a3caef0f94f9721361a749f0b6429f30ce;hp=3bdd11ae47a6a814b7ddebc550dceb062c094500;hpb=10c9f47884508cec3b96340be0b4118938633e51;p=elisp%2Fwanderlust.git

diff --git a/wl/wl-e21.el b/wl/wl-e21.el
index 3bdd11a..ffabf4a 100644
--- a/wl/wl-e21.el
+++ b/wl/wl-e21.el
@@ -122,8 +122,8 @@
      wl-summary-sync-force-update t "Sync Current Folder"]
     [wl-summary-dispose
      wl-summary-dispose t "Dispose Current Message"]
-    [wl-summary-mark-as-important
-     wl-summary-mark-as-important t "Mark Current Message as Important"]
+    [wl-summary-set-flags
+     wl-summary-set-flags t "Set Flags"]
     [wl-draft
      wl-summary-write-current-folder t "Write for Current Folder"]
     [wl-summary-reply
@@ -363,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-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)))
@@ -427,23 +429,24 @@
 
 (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-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 (wl-e21-display-image-p)
@@ -537,6 +540,9 @@
     (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)
@@ -544,6 +550,23 @@
 
 (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 (regexp-quote wl-message-buffer-name)
@@ -630,7 +653,9 @@ Special commands:
 ;;  (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 "\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)
@@ -645,6 +670,8 @@ 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)