procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug #16694 with theme face precedence.

Browse source 
lisp/faces.el (face-spec-recalc): Call make-face-x-resource-internal
 only when inhibit-x-resources is nil, and do that earlier in the
 function.  Doc fix.
This commit is contained in:
Matthias Dahl 2014-04-05 10:15:11 +03:00 • committed by Eli Zaretskii
parent 3ccd4eafd3
commit eb7a03cc76
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2014-04-05 Matthias Dahl <ml_emacs-lists@binary-island.eu>
* faces.el (face-spec-recalc): Call make-face-x-resource-internal
only when inhibit-x-resources is nil, and do that earlier in the
function. Doc fix. (Bug#16694)
2014-04-04 Tassilo Horn <tsdh@gnu.org>
* doc-view.el (doc-view-bookmark-jump): Use

15
lisp/faces.el
View file

@ -1619,11 +1619,19 @@ function for its other effects."
(defun face-spec-recalc (face frame)
"Reset the face attributes of FACE on FRAME according to its specs.
This applies the defface/custom spec first, then the custom theme specs,
then the override spec."
After the reset, the specs are applied from the following sources in this order:
X resources (if applicable)
|
(theme and user customization)
or, if nonexistent or does not match the current frame,
(defface default spec)
|
defface override spec"
(while (get face 'face-alias)
(setq face (get face 'face-alias)))
(face-spec-reset-face face frame)
(unless inhibit-x-resources
(make-face-x-resource-internal face frame))
;; If FACE is customized or themed, set the custom spec from
;; `theme-face' records.
(let ((theme-faces (get face 'theme-face))
@ -1641,8 +1649,7 @@ then the override spec."
(setq spec (face-spec-choose (face-default-spec face) frame))
(face-spec-set-2 face frame spec))
(setq spec (face-spec-choose (get face 'face-override-spec) frame))
(face-spec-set-2 face frame spec))
(make-face-x-resource-internal face frame))
(face-spec-set-2 face frame spec)))
(defun face-spec-set-2 (face frame spec)
"Set the face attributes of FACE on FRAME according to SPEC."