procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle case where a face's :extend attribute is unspecified (Bug#37774)

Browse source 
* src/xfaces.c (merge_face_vectors, merge_named_face): Handle case
where the :extend attribute's value is 'unspecified' (Bug#37774).
This commit is contained in:
Jimmy Aguilar Mena 2019-11-08 09:31:33 +01:00 • committed by Martin Rudalics
parent a070bd1c8b
commit 8232325337
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/xfaces.c
View file

@ -2062,8 +2062,13 @@ merge_face_vectors (struct window *w, struct frame *f,
eassert (attr_filter < LFACE_VECTOR_SIZE);
/* When FROM sets attr_filter to nil explicitly we don't merge it. */
if (attr_filter > 0 && NILP(from[attr_filter]))
/* When FROM sets attr_filter explicitly to nil or unspecified
without inheriting don't merge it. */
if (attr_filter > 0
&& (NILP(from[attr_filter])
|| (UNSPECIFIEDP(from[attr_filter])
&& (NILP (from[LFACE_INHERIT_INDEX])
|| UNSPECIFIEDP (from[LFACE_INHERIT_INDEX])))))
return;
/* If FROM inherits from some other faces, merge their attributes into
@ -2082,7 +2087,7 @@ merge_face_vectors (struct window *w, struct frame *f,
else if (UNSPECIFIEDP (from[attr_filter])) /* FROM don't specify filter */
{
Lisp_Object tmp[LFACE_VECTOR_SIZE];
memcpy (tmp, to, LFACE_VECTOR_SIZE * sizeof *tmp);
memcpy (tmp, to, LFACE_VECTOR_SIZE * sizeof(*tmp));
merge_face_ref (w, f, from[LFACE_INHERIT_INDEX],
tmp, false, named_merge_points, attr_filter);
@ -2177,7 +2182,8 @@ merge_named_face (struct window *w,
&& !UNSPECIFIEDP(from[attr_filter]))
|| (!NILP(from[attr_filter]) /* Filter, unspecified, but inherited. */
&& UNSPECIFIEDP(from[attr_filter])
&& !NILP (from[LFACE_INHERIT_INDEX]))))
&& !NILP (from[LFACE_INHERIT_INDEX])
&& !UNSPECIFIEDP (from[LFACE_INHERIT_INDEX]))))
merge_face_vectors (w, f, from, to, named_merge_points, attr_filter);
return ok;