From: yoichi <yoichi>
Date: Sat, 19 Jun 2004 10:47:16 +0000 (+0000)
Subject: (wl-e21-highlight-folder-group-line): Highlight mouse line
X-Git-Tag: wl-2_11_31~101
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=1b4202da697c0a3c16ac1f31d808db48ded82ac0;p=elisp%2Fwanderlust.git

(wl-e21-highlight-folder-group-line): Highlight mouse line
even if wl-e21-display-image-p is nil.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 7b99301..9d2e83b 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -2,6 +2,8 @@
 
 	* wl-e21.el (wl-e21-display-image-p): Respect
 	`wl-highlight-folder-with-icon'.
+	(wl-e21-highlight-folder-group-line): Highlight mouse line
+	even if wl-e21-display-image-p is nil.
 
 	* wl-summary.el (wl-summary-update-mark-and-highlight-window):
 	Respect value of `wl-summary-highlight'.
diff --git a/wl/wl-e21.el b/wl/wl-e21.el
index fab1a62..93b6349 100644
--- a/wl/wl-e21.el
+++ b/wl/wl-e21.el
@@ -248,30 +248,31 @@
 
 (eval-when-compile
   (defsubst wl-e21-highlight-folder-group-line (start end icon numbers)
-    (when (wl-e21-display-image-p)
-      (let (overlay)
-	(let ((overlays (overlays-in start end)))
-	  (while (and (setq overlay (pop overlays))
-		      (not (overlay-get overlay 'wl-e21-icon)))))
-	(unless overlay
-	  (setq overlay (make-overlay start end))
-	  (overlay-put overlay 'wl-e21-icon t)
-	  (overlay-put overlay 'evaporate t))
-	(let ((image (get icon 'image)))
+    (let (image)
+      (when (wl-e21-display-image-p)
+	(let (overlay)
+	  (let ((overlays (overlays-in start end)))
+	    (while (and (setq overlay (pop overlays))
+			(not (overlay-get overlay 'wl-e21-icon)))))
+	  (unless overlay
+	    (setq overlay (make-overlay start end))
+	    (overlay-put overlay 'wl-e21-icon t)
+	    (overlay-put overlay 'evaporate t))
+	  (setq image (get icon 'image))
 	  (unless image
 	    (let ((name (symbol-value
 			 (cdr (assq icon wl-folder-toggle-icon-list))))
 		  (load-path (cons wl-icon-directory load-path)))
 	      (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
-				     (max (1- start) (line-beginning-position))
-				   start)
-				 (line-end-position)
-				 'mouse-face 'highlight)))))))
+	  (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
+				 (max (1- start) (line-beginning-position))
+			       start)
+			     (line-end-position)
+			     'mouse-face 'highlight)))))
 
   (defsubst wl-e21-highlight-folder-by-numbers (start end text-face numbers)
     (when (display-color-p)