andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(face-set-after-frame-default): Revert 2007-03-10 change. Merge in X

Browse source 
resources before global face.
This commit is contained in:
Chong Yidong 2007-03-25 18:58:06 +00:00
parent 17927b3941
commit 6aa2269da5
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -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.

6
lisp/faces.el
View file

@ -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