mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-22 07:09:54 +00:00
Code Issues Releases Activity

Revert last commit.

Browse Source
This commit is contained in:
Eli Zaretskii 2014-03-22 10:28:20 +02:00
parent 7c326d7116
commit e74e1d1bf8
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ChangeLog
View File

@ -1,9 +1,3 @@
2014-03-22 Matthias Dahl <matthias.dahl@binary-island.eu>
* faces.el (face-spec-recalc): Doc fix. Call
make-face-x-resource-internal earlier, and condition that on
no-init-from-resources being nil. (Bug#16694)
2014-03-22 Juanma Barranquero <lekktu@gmail.com>
* w32-common-fns.el (x-selection-owner-p): Add empty docstring for the

15
lisp/faces.el
View File

@ -1619,19 +1619,11 @@ function for its other effects."
(defun face-spec-recalc (face frame)
"Reset the face attributes of FACE on FRAME according to its specs.
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"
This applies the defface/custom spec first, then the custom theme specs,
then the override spec."
(while (get face 'face-alias)
(setq face (get face 'face-alias)))
(face-spec-reset-face face frame)
(unless no-init-from-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))
@ -1649,7 +1641,8 @@ After the reset, the specs are applied from the following sources in this order:
(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)))
(face-spec-set-2 face frame spec))
(make-face-x-resource-internal face frame))
(defun face-spec-set-2 (face frame spec)
"Set the face attributes of FACE on FRAME according to SPEC."