diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2019-11-25 17:52:24 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2019-11-25 17:52:24 +0200 |
| commit | 19aecd340b7b3ab54629b790ba70a90130bad63d (patch) | |
| tree | c323d0ef86896e8f660250c7d88ec61c1d0c30f1 /test/lisp/emacs-lisp/timer-tests.el | |
| parent | 2d12d4d2d467f5df81e232707ad9191264b7c2b0 (diff) | |
| download | emacs-19aecd340b7b3ab54629b790ba70a90130bad63d.tar.gz emacs-19aecd340b7b3ab54629b790ba70a90130bad63d.tar.bz2 emacs-19aecd340b7b3ab54629b790ba70a90130bad63d.zip | |
Fix face merging when some have :extend non-nil and some are inherited
* src/xfaces.c (face_inherited_attr): New function.
(merge_named_face): Call 'face_inherited_attr' when testing
whether a face that inherits from another fits the filtering
criteria specified by ATTR_FILTER.
(merge_face_vectors): Revert the changes made in this function
for filtering by ATTR_FILTER, and remove that argument as
well. These tests are now completely done by the caller, see
'merge_named_face'. (Bug#37774)
Diffstat (limited to 'test/lisp/emacs-lisp/timer-tests.el')
0 files changed, 0 insertions, 0 deletions