diff lisp/utils/live-icon.el @ 124:9b50b4588a93 r20-1b15

Import from CVS: tag r20-1b15
author cvs
date Mon, 13 Aug 2007 09:26:39 +0200
parents 0293115a14e9
children 34a5b81f86ba
line wrap: on
line diff
--- a/lisp/utils/live-icon.el	Mon Aug 13 09:26:04 2007 +0200
+++ b/lisp/utils/live-icon.el	Mon Aug 13 09:26:39 2007 +0200
@@ -37,9 +37,10 @@
 	   (or (> emacs-major-version 19)
 	       (and (= emacs-major-version 19)
 		    (>= emacs-minor-version 12))))
-      (let ((colour (if bg-p
-			(face-background face)
-		      (face-foreground face))))
+      (let* ((face (if (consp face) (car face) face))
+	     (colour (if bg-p
+			 (face-background face)
+		       (face-foreground face))))
 	(if (consp colour)
 	    (setq colour (cdr (car colour))))
 	(if (color-instance-p colour)