Skip to content

GitLab

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)
1 job for master in 62 minutes and 17 seconds (queued for 3 seconds)
19aecd34
No related merge requests found.
Status Job ID Name Coverage
  Test
failed #4337
test-all

01:02:17

 
Name Stage Failure
failed
test-all Test 
make[2]: *** [check-doit] Error 1
make[1]: *** [check-expensive] Error 2
Makefile:319: recipe for target 'check-doit' failed
make[2]: Leaving directory '/builds/emacs/emacs/test'
Makefile:294: recipe for target 'check-expensive' failed
make[1]: Leaving directory '/builds/emacs/emacs/test'
Makefile:959: recipe for target 'check-expensive' failed
make: *** [check-expensive] Error 2
ERROR: Job failed: exit code 1