aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/cus-face.el
diff options
context:
space:
mode:
authorAdrian Robert2008-07-15 18:15:18 +0000
committerAdrian Robert2008-07-15 18:15:18 +0000
commitedfda78355c5528eee489fa8a7f9c73bf8e734f2 (patch)
tree78d2414d9791e1efc17ec9b35b438ae35602340a /lisp/cus-face.el
parent1391cd548782097e34d7856ec4f20ca90bdf2c26 (diff)
downloademacs-edfda78355c5528eee489fa8a7f9c73bf8e734f2.tar.gz
emacs-edfda78355c5528eee489fa8a7f9c73bf8e734f2.zip
merging Emacs.app (NeXTstep port)
Diffstat (limited to 'lisp/cus-face.el')
-rw-r--r--lisp/cus-face.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/cus-face.el b/lisp/cus-face.el
index 318fd61fc34..5581cff9588 100644
--- a/lisp/cus-face.el
+++ b/lisp/cus-face.el
@@ -44,7 +44,7 @@
44 ;; Create frame-local faces 44 ;; Create frame-local faces
45 (dolist (frame (frame-list)) 45 (dolist (frame (frame-list))
46 (face-spec-set-2 face frame value) 46 (face-spec-set-2 face frame value)
47 (when (memq (window-system frame) '(x w32 mac)) 47 (when (memq (window-system frame) '(x w32 mac ns))
48 (setq have-window-system t))) 48 (setq have-window-system t)))
49 ;; When making a face after frames already exist 49 ;; When making a face after frames already exist
50 (if have-window-system 50 (if have-window-system