[win32] (make-face, make-face-x-resource-internal):
Test for 'win32 window system as well as 'x.
This commit is contained in:
parent
f93f3cf59e
commit
7b10bca5f7
1 changed files with 3 additions and 3 deletions
|
@ -346,7 +346,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 (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 @@ If the face already exists, it is unmodified."
|
|||
(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 @@ selected frame."
|
|||
(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)
|
||||
|
|
Loading…
Add table
Reference in a new issue