From 21d5ff409e5dc3f643d0a45fb8e17faded355a67 Mon Sep 17 00:00:00 2001 From: hmurata Date: Sat, 3 Jul 2004 08:26:39 +0000 Subject: [PATCH] (wl-plugged-set-folder-icon): Follow the change for multi-tty support. --- wl/ChangeLog | 5 +++++ wl/wl-e21.el | 26 +++++++++++++------------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/wl/ChangeLog b/wl/ChangeLog index 1a71e6f..096613a 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,8 @@ +2004-07-03 Hiroya Murata + + * wl-e21.el (wl-plugged-set-folder-icon): Follow the change for + multi-tty support. + 2004-07-01 Tetsurou Okazaki * wl-folder.el (wl-folder-update-group): Change `defsubst' to `defun'. diff --git a/wl/wl-e21.el b/wl/wl-e21.el index 93b6349..e5ca8dc 100644 --- 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) -- 1.7.10.4