mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-28 16:21:07 -08:00
Code Issues Projects Releases Wiki Activity

Another fix for :extend when :inherit is used

Browse source 
* src/xfaces.c (face_inherited_attr): Support also values of
:inherit which are lists.  (Bug#37774)
This commit is contained in:
Eli Zaretskii 2019-12-05 19:58:02 +02:00
parent 21790e5473
commit 5ee43ba0df
1 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/xfaces.c
View file

@ -2163,11 +2163,31 @@ face_inherited_attr (struct window *w, struct frame *f,
&& !UNSPECIFIEDP (inherited_attrs[LFACE_INHERIT_INDEX]))
{
Lisp_Object parent_face = inherited_attrs[LFACE_INHERIT_INDEX];
bool ok = get_lface_attributes (w, f, parent_face, inherited_attrs,
false, named_merge_points);
if (!ok)
break;
attr_val = inherited_attrs[attr_idx];
bool ok;
if (CONSP (parent_face))
{
Lisp_Object tail;
for (tail = parent_face; !NILP (tail); tail = XCDR (tail))
{
ok = get_lface_attributes (w, f, XCAR (tail), inherited_attrs,
false, named_merge_points);
if (!ok)
break;
attr_val = face_inherited_attr (w, f, inherited_attrs, attr_idx,
named_merge_points);
if (!UNSPECIFIEDP (attr_val))
break;
}
}
else
{
ok = get_lface_attributes (w, f, parent_face, inherited_attrs,
false, named_merge_points);
if (!ok)
break;
attr_val = inherited_attrs[attr_idx];
}
}
return attr_val;
}