aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/faces.el
diff options
context:
space:
mode:
authorDavid Reitter2009-03-16 20:46:59 +0000
committerDavid Reitter2009-03-16 20:46:59 +0000
commite51fe00a187fb450681cb5da61c461b6327f0863 (patch)
tree84d46333c38602b37a3181295f1cc7dd7bdfebf5 /lisp/faces.el
parent4b7a79019936acdd84c5c22bee623c39d79adb17 (diff)
downloademacs-e51fe00a187fb450681cb5da61c461b6327f0863.tar.gz
emacs-e51fe00a187fb450681cb5da61c461b6327f0863.zip
set-face-attributes-from-resources, face-set-after-frame-default:
Do not import X resources on NS because NS does not have system-wide X resources.
Diffstat (limited to 'lisp/faces.el')
-rw-r--r--lisp/faces.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/faces.el b/lisp/faces.el
index 522446add15..21de277cbce 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -338,7 +338,7 @@ specifies an invalid attribute."
338 338
339(defun set-face-attributes-from-resources (face frame) 339(defun set-face-attributes-from-resources (face frame)
340 "Set attributes of FACE from X resources for FRAME." 340 "Set attributes of FACE from X resources for FRAME."
341 (when (memq (framep frame) '(x w32 ns)) 341 (when (memq (framep frame) '(x w32))
342 (dolist (definition face-x-resources) 342 (dolist (definition face-x-resources)
343 (let ((attribute (car definition))) 343 (let ((attribute (car definition)))
344 (dolist (entry (cdr definition)) 344 (dolist (entry (cdr definition))
@@ -2020,7 +2020,7 @@ frame parameters in PARAMETERS and `default-frame-alist'."
2020 ;; X resouces for the default face are applied during 2020 ;; X resouces for the default face are applied during
2021 ;; x-create-frame. 2021 ;; x-create-frame.
2022 (and (not (eq face 'default)) 2022 (and (not (eq face 'default))
2023 (memq (window-system frame) '(x w32 ns)) 2023 (memq (window-system frame) '(x w32))
2024 (make-face-x-resource-internal face frame)) 2024 (make-face-x-resource-internal face frame))
2025 ;; Apply attributes specified by face-new-frame-defaults 2025 ;; Apply attributes specified by face-new-frame-defaults
2026 (internal-merge-in-global-face face frame)) 2026 (internal-merge-in-global-face face frame))