From: hmurata <hmurata>
Date: Sat, 29 May 2004 11:08:24 +0000 (+0000)
Subject: * wl-e21.el (wl-e21-display-image-p): Don't call
X-Git-Tag: wl-2_11_30~26
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98f90a85c0719c350d6dcd4050ef5398eb76b77f;p=elisp%2Fwanderlust.git

* wl-e21.el (wl-e21-display-image-p): Don't call
`display-images-p'.
(wl-e21-highlight-folder-group-line): Change for emacs multi-tty
support.
(wl-highlight-folder-current-line): Ditto.
(wl-folder-init-icons): Ditto.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 84bebd3..ba53821 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,12 @@
+2004-05-29  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
+
+	* wl-e21.el (wl-e21-display-image-p): Don't call
+	`display-images-p'.
+	(wl-e21-highlight-folder-group-line): Change for emacs multi-tty
+	support.
+	(wl-highlight-folder-current-line): Ditto.
+	(wl-folder-init-icons): Ditto.
+
 2004-05-26  Yoichi NAKAYAMA  <yoichi@geiin.org>
 
 	* wl-summary.el (wl-summary-cursor-move-surface): Avoid error on
diff --git a/wl/wl-e21.el b/wl/wl-e21.el
index ffabf4a..1a9e0eb 100644
--- a/wl/wl-e21.el
+++ b/wl/wl-e21.el
@@ -171,8 +171,7 @@
 
 (eval-when-compile
   (defmacro wl-e21-display-image-p ()
-    '(and (display-images-p)
-	  (image-type-available-p 'xpm))))
+    '(image-type-available-p 'xpm)))
 
 (defun wl-e21-setup-toolbar (bar)
   (when (and wl-use-toolbar
@@ -262,12 +261,9 @@
 	    (let ((name (symbol-value
 			 (cdr (assq icon wl-folder-toggle-icon-list))))
 		  (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
-							 'display image))))))
-	  (overlay-put overlay 'before-string image)
-	  (overlay-put overlay 'invisible (and image t))
+	      (setq image (find-image `((:type xpm :file ,name
+					       :ascent center))))))
+	  (overlay-put overlay 'display image)
 	  (when (and wl-use-highlight-mouse-line (display-mouse-p))
 	    (let ((inhibit-read-only t))
 	      (put-text-property (if image
@@ -368,7 +364,9 @@
 					     (elmo-make-folder fld-name))))
 			     (get (intern (format "wl-folder-%s-image" type))
 				  'image)))))
-	      (overlay-put overlay 'before-string image)))
+	      (overlay-put overlay 'before-string
+			   (propertize " " 'display image
+				       'invisible t))))
 	  (when (and wl-use-highlight-mouse-line (display-mouse-p))
 	    (let ((inhibit-read-only t))
 	      (put-text-property (if image
@@ -458,7 +456,7 @@
 	  (setq name (symbol-value (cdr icon))
 		image (find-image `((:type xpm :file ,name :ascent center))))
 	  (when image
-	    (put (car icon) 'image (propertize name 'display image))))))))
+	    (put (car icon) 'image image)))))))
 
 (defun wl-plugged-init-icons ()
   (let ((props (when (display-mouse-p)