diff options
| author | Richard M. Stallman <rms@gnu.org> | 1996-09-15 02:15:42 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1996-09-15 02:15:42 +0000 |
| commit | c10e8c420f07b6d76c84ccb5e6adc59db71154f3 (patch) | |
| tree | 3075aec538ccb5732b55b61759d98e825f195878 /lisp | |
| parent | ab70af307ac4d58931fa4a5c55791797c3b0767c (diff) | |
| download | emacs-c10e8c420f07b6d76c84ccb5e6adc59db71154f3.tar.gz | |
(make-face, make-face-x-resource-internal):
Test for ms-windows instead of win32. Use memq.
(initialization at end of file): Likewise.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/faces.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index 02de29f02b4..65011985dbb 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -409,7 +409,7 @@ If the face already exists, it is unmodified." (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 @@ If the face already exists, it is unmodified." (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 @@ selected frame." (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) |