* elmo-archive.el (elmo-archive-get-archive-name): Fixed

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

diff --git a/wl/wl-e21.el b/wl/wl-e21.el
index 17135fc..2ecf5dd 100644 (file)
--- a/wl/wl-e21.el
+++ b/wl/wl-e21.el
@@ -62,6 +62,7 @@
 ;;; Code:
 ;;
 
+(require 'elmo)
 (eval-when-compile
   (require 'wl-folder)
   (require 'wl-summary)
@@ -357,7 +358,7 @@
                            ((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 (elmo-folder-type fld-name))
                             (get (intern (format "wl-folder-%s-image" type))
                                  'image)))))
              (overlay-put overlay 'before-string image)))
@@ -408,14 +409,12 @@
   (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)))
@@ -434,6 +433,8 @@
     (wl-folder-archive-image      . wl-archive-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-trash-empty-image  . wl-empty-trash-folder-icon)
     (wl-folder-draft-image        . wl-draft-folder-icon)
     (wl-folder-queue-image        . wl-queue-folder-icon)
@@ -537,7 +538,8 @@
 
 (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-cache-name)
+                   (regexp-quote (buffer-name)))
       (wl-message-next-page)
     (let ((cur-buf (current-buffer))
          proceed)
@@ -552,7 +554,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-cache-name)
+                   (regexp-quote (buffer-name)))
       (wl-message-prev-page)
     (let ((cur-buf (current-buffer))
          proceed)
@@ -609,7 +612,7 @@ Special commands:
 
 (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))