Mercurial > emacs
comparison lisp/faces.el @ 76731:e3710dba6329
(face-set-after-frame-default): Revert 2007-03-10 change. Merge in X
resources before global face.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sun, 25 Mar 2007 18:58:06 +0000 |
| parents | 39ea9041214f |
| children | 9355f9b7bbff afd58ab52ea7 dc002877ce12 4ef881a120fe |
comparison
equal
deleted
inserted
replaced
| 76730:99960fddd88c | 76731:e3710dba6329 |
|---|---|
| 1787 ;; creation to fail. | 1787 ;; creation to fail. |
| 1788 (dolist (face (delq 'default (face-list))) | 1788 (dolist (face (delq 'default (face-list))) |
| 1789 (condition-case () | 1789 (condition-case () |
| 1790 (progn | 1790 (progn |
| 1791 (face-spec-set face (face-user-default-spec face) frame) | 1791 (face-spec-set face (face-user-default-spec face) frame) |
| 1792 (internal-merge-in-global-face face frame) | |
| 1793 (if (memq window-system '(x w32 mac)) | 1792 (if (memq window-system '(x w32 mac)) |
| 1794 (make-face-x-resource-internal face frame)) | 1793 (make-face-x-resource-internal face frame)) |
| 1795 ;; If the user has customized the face, don't let X | 1794 (internal-merge-in-global-face face frame)) |
| 1796 ;; resources override the customizations. | |
| 1797 (if (get face 'theme-face) | |
| 1798 (custom-theme-recalc-face face))) | |
| 1799 (error nil))) | 1795 (error nil))) |
| 1800 ;; Apply the attributes specified by frame parameters. This | 1796 ;; Apply the attributes specified by frame parameters. This |
| 1801 ;; rewrites parameters changed by make-face-x-resource-internal | 1797 ;; rewrites parameters changed by make-face-x-resource-internal |
| 1802 (dolist (param apply-params) | 1798 (dolist (param apply-params) |
| 1803 (apply 'set-face-attribute param)))) | 1799 (apply 'set-face-attribute param)))) |