# HG changeset patch
# User Geoff Voelker <voelker@cs.washington.edu>
# Date 815730492 0
# Node ID c0c8b0a210e0dd0c2377fe54d4d8524d3dbba9bd
# Parent  5ac58afd6c8c74897e3cebf348155a51e5d5d7eb
[win32] (make-face, make-face-x-resource-internal):
Test for 'win32 window system as well as 'x.

diff -r 5ac58afd6c8c -r c0c8b0a210e0 lisp/faces.el
--- a/lisp/faces.el	Tue Nov 07 07:47:47 1995 +0000
+++ b/lisp/faces.el	Tue Nov 07 07:48:12 1995 +0000
@@ -346,7 +346,7 @@
 	    (setq frames (cdr frames)))
 	  (setq global-face-data (cons (cons name face) global-face-data)))
 	;; when making a face after frames already exist
-	(if (eq window-system 'x)
+	(if (or (eq window-system 'x) (eq window-system 'win32))
 	    (make-face-x-resource-internal face))
 	;; add to menu
 	(if (fboundp 'facemenu-add-new-face)
@@ -360,7 +360,7 @@
   (cond ((null frame)
 	 (let ((frames (frame-list)))
 	   (while frames
-	     (if (eq (framep (car frames)) 'x)
+	     (if (or (eq (framep (car frames)) 'x) (eq (framep (car frames)) 'win32))
 		 (make-face-x-resource-internal (face-name face)
 						(car frames) set-anyway))
 	     (setq frames (cdr frames)))))
@@ -1228,7 +1228,7 @@
 	  (setq colors (cdr colors)))))))
 
 ;; If we are already using x-window frames, initialize faces for them.
-(if (eq (framep (selected-frame)) 'x)
+(if (or (eq (framep (selected-frame)) 'x) (eq (framep (selected-frame)) 'win32))
     (face-initialize))
 
 (provide 'faces)