diff lisp/faces.el @ 284:558f606b08ae r21-0b40

Import from CVS: tag r21-0b40
author cvs
date Mon, 13 Aug 2007 10:34:13 +0200
parents c5d627a313b1
children 57709be46d1b
line wrap: on
line diff
--- a/lisp/faces.el	Mon Aug 13 10:33:19 2007 +0200
+++ b/lisp/faces.el	Mon Aug 13 10:34:13 2007 +0200
@@ -751,7 +751,7 @@
       (error "Invalid specifier domain"))
   (let ((device (dfw-device domain))
 	(common-props '(foreground background font display-table underline))
-	(x-props '(background-pixmap strikethru))
+	(win-props '(background-pixmap strikethru))
 	(tty-props '(highlight dim blinking reverse)))
 
     ;; First check the properties which are used in common between the
@@ -760,8 +760,9 @@
     (and (face-equal-loop common-props face1 face2 domain)
 	 (cond ((eq 'tty (device-type device))
 		(face-equal-loop tty-props face1 face2 domain))
-	       ((eq 'x (device-type device))
-		(face-equal-loop x-props face1 face2 domain))
+	       ((or (eq 'x (device-type device))
+		    (eq 'mswindows (device-type device)))
+		(face-equal-loop win-props face1 face2 domain))
 	       (t t)))))
 
 (defun face-differs-from-default-p (face &optional domain)