diff options
| -rw-r--r-- | src/xfaces.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index e4d19440bc9..3806fa90e23 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -2085,7 +2085,7 @@ merge_face_vectors (struct window *w, struct frame *f, memcpy (tmp, to, LFACE_VECTOR_SIZE * sizeof *tmp); merge_face_ref (w, f, from[LFACE_INHERIT_INDEX], - tmp, false, named_merge_points, 0); + tmp, false, named_merge_points, attr_filter); if (NILP (tmp[attr_filter]) || UNSPECIFIEDP (tmp[attr_filter])) @@ -2172,7 +2172,12 @@ merge_named_face (struct window *w, bool ok = get_lface_attributes (w, f, face_name, from, false, named_merge_points); - if (ok && (attr_filter == 0 || !NILP(from[attr_filter]))) + if (ok && (attr_filter == 0 /* No filter. */ + || (!NILP(from[attr_filter]) /* Filter, but specified. */ + && !UNSPECIFIEDP(from[attr_filter])) + || (!NILP(from[attr_filter]) /* Filter, unspecified, but inherited. */ + && UNSPECIFIEDP(from[attr_filter]) + && !NILP (from[LFACE_INHERIT_INDEX])))) merge_face_vectors (w, f, from, to, named_merge_points, attr_filter); return ok; |