diff lisp/faces.el @ 16199:01511a730dd8

(make-face, make-face-x-resource-internal): Test for ms-windows instead of win32. Use memq. (initialization at end of file): Likewise.

--- a/lisp/faces.el	Sun Sep 15 02:13:16 1996 +0000
+++ b/lisp/faces.el	Sun Sep 15 02:15:42 1996 +0000
@@ -409,7 +409,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 (or (eq window-system 'x) (eq window-system 'win32))
+	(if (memq window-system '(x ms-windows))
 	    (make-face-x-resource-internal face))
 	;; add to menu
 	(if (fboundp 'facemenu-add-new-face)
@@ -423,7 +423,7 @@
   (cond ((null frame)
 	 (let ((frames (frame-list)))
 	   (while frames
-	     (if (or (eq (framep (car frames)) 'x) (eq (framep (car frames)) 'win32))
+	     (if (memq (framep (car frames)) '(x ms-windows))
 		 (make-face-x-resource-internal (face-name face)
 						(car frames) set-anyway))
 	     (setq frames (cdr frames)))))
@@ -1303,7 +1303,7 @@
 	  (setq colors (cdr colors)))))))
 
 ;; If we are already using x-window frames, initialize faces for them.
-(if (or (eq (framep (selected-frame)) 'x) (eq (framep (selected-frame)) 'win32))
+(if (memq (framep (selected-frame)) '(x ms-windows))
     (face-initialize))
 
 (provide 'faces)