Mercurial > emacs
comparison lisp/faces.el @ 97048:07311809a1f0
faces.el:face-set-after-frame-default: treat ns as other window systems
| author | Adrian Robert <Adrian.B.Robert@gmail.com> |
|---|---|
| date | Mon, 28 Jul 2008 01:45:53 +0000 |
| parents | 9592c50233ab |
| children | 85f30f831ede |
comparison
equal
deleted
inserted
replaced
| 97047:c628dd388bdb | 97048:07311809a1f0 |
|---|---|
| 2025 ;; Initialize faces from face spec and custom theme. | 2025 ;; Initialize faces from face spec and custom theme. |
| 2026 (face-spec-recalc face frame) | 2026 (face-spec-recalc face frame) |
| 2027 ;; X resouces for the default face are applied during | 2027 ;; X resouces for the default face are applied during |
| 2028 ;; x-create-frame. | 2028 ;; x-create-frame. |
| 2029 (and (not (eq face 'default)) | 2029 (and (not (eq face 'default)) |
| 2030 (memq (window-system frame) '(x w32)) | 2030 (memq (window-system frame) '(x w32 ns)) |
| 2031 (make-face-x-resource-internal face frame)) | 2031 (make-face-x-resource-internal face frame)) |
| 2032 ;; Apply attributes specified by face-new-frame-defaults | 2032 ;; Apply attributes specified by face-new-frame-defaults |
| 2033 (internal-merge-in-global-face face frame)) | 2033 (internal-merge-in-global-face face frame)) |
| 2034 ;; Don't let invalid specs prevent frame creation. | 2034 ;; Don't let invalid specs prevent frame creation. |
| 2035 (error nil))) | 2035 (error nil))) |