Synch up with main trunk, and prepare the release 2.12.0.

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

diff --git a/wl/wl-e21.el b/wl/wl-e21.el
index 93b6349..152f059 100644 (file)
--- a/wl/wl-e21.el
+++ b/wl/wl-e21.el
@@ -411,19 +411,19 @@
              (overlay-put overlay 'display image))))))))
 
 (defun wl-plugged-set-folder-icon (folder string)
-  (if (wl-e21-display-image-p)
-      (let (type)
-       (cond ((string= folder wl-queue-folder)
-              (concat (get 'wl-folder-queue-image 'image)
-                      string))
-             ((setq type (elmo-folder-type folder))
-              (concat (get (intern (format "wl-folder-%s-image"
-                                           type))
-                           'image)
-                      string))
-             (t
-              string)))
-    string))
+  (let (image type)
+    (when (wl-e21-display-image-p)
+      (setq image
+           (cond ((string= folder wl-queue-folder)
+                  (get 'wl-folder-queue-image 'image))
+                 ((setq type (or (elmo-folder-type folder)
+                                 (elmo-folder-type-internal
+                                  (elmo-make-folder folder))))
+                  (get (intern (format "wl-folder-%s-image" type))
+                       'image)))))
+    (if image
+       (concat (propertize " " 'display image 'invisible t) string)
+      string)))
 
 (defvar wl-folder-internal-icon-list
   ;; alist of (image . icon-file)
@@ -534,6 +534,7 @@
     (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 "w" 'wl-draft)
     (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)
@@ -631,7 +632,8 @@
 See info under Wanderlust for full documentation.
 
 Special commands:
-\\{wl-draft-mode-map}"))
+\\{wl-draft-mode-map}"
+    (setq font-lock-defaults nil)))
 
 (defun wl-draft-key-setup ()
   (define-key wl-draft-mode-map "\C-c\C-y" 'wl-draft-yank-original)