GitLab

Remove #ifdef'd-out code.
(Fface_attribute_relative_p, Fmerge_face_attribute): New functions.
(syms_of_xfaces): Initialize them.