mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-24 10:38:38 +00:00
(face-set-after-frame-default): Revert 2007-03-10 change. Merge in X
resources before global face.
This commit is contained in:
parent
17927b3941
commit
6aa2269da5
@ -1,5 +1,8 @@
|
||||
2007-03-25 Chong Yidong <cyd@stupidchicken.com>
|
||||
|
||||
* faces.el (face-set-after-frame-default): Revert 2007-03-10
|
||||
change. Merge in X resources before global face.
|
||||
|
||||
* progmodes/compile.el (compilation-start): Save
|
||||
compilation-directory rather than default-directory as local var.
|
||||
(compilation-directory): Mark as safe local var.
|
||||
|
@ -1789,13 +1789,9 @@ Initialize colors of certain faces from frame parameters."
|
||||
(condition-case ()
|
||||
(progn
|
||||
(face-spec-set face (face-user-default-spec face) frame)
|
||||
(internal-merge-in-global-face face frame)
|
||||
(if (memq window-system '(x w32 mac))
|
||||
(make-face-x-resource-internal face frame))
|
||||
;; If the user has customized the face, don't let X
|
||||
;; resources override the customizations.
|
||||
(if (get face 'theme-face)
|
||||
(custom-theme-recalc-face face)))
|
||||
(internal-merge-in-global-face face frame))
|
||||
(error nil)))
|
||||
;; Apply the attributes specified by frame parameters. This
|
||||
;; rewrites parameters changed by make-face-x-resource-internal
|
||||
|
Loading…
Reference in New Issue
Block a user