Commit 06d35c2d authored by Jimmy Aguilar Mena's avatar Jimmy Aguilar Mena

Fixed merge_face_ref recursive calls.

* src/xfaces.c (merge_face_ref) : Fixed recursive calls to consider
filter when CONSP (face_ref).
parent 1fe9bee2
......@@ -20473,7 +20473,6 @@ append_space_for_newline (struct it *it, bool default_face_p)
static void
extend_face_to_end_of_line (struct it *it)
struct face *face;
struct frame *f = it->f;
/* If line is already filled, do nothing. Non window-system frames
......@@ -20498,9 +20497,9 @@ extend_face_to_end_of_line (struct it *it)
/* Face extension extends the background and box of IT->extend_face_id
to the end of the line. If the background equals the background
of the frame, we don't have to do anything. */
face = FACE_FROM_ID (f, (it->face_before_selective_p
? it->saved_face_id
: extend_face_id));
struct face *face = FACE_FROM_ID (f, (it->face_before_selective_p
? it->saved_face_id
: extend_face_id));
&& MATRIX_ROW_DISPLAYS_TEXT_P (it->glyph_row)
......@@ -2529,7 +2529,7 @@ merge_face_ref (struct window *w,
normal face reference. */
if (! merge_face_ref (w, f, value, to,
err_msgs, named_merge_points,
err = true;
else if (EQ (keyword, QCextend))
......@@ -2560,10 +2560,10 @@ merge_face_ref (struct window *w,
if (! NILP (next))
ok = merge_face_ref (w, f, next, to, err_msgs,
named_merge_points, 0);
named_merge_points, attr_filter);
if (! merge_face_ref (w, f, first, to, err_msgs,
named_merge_points, 0))
named_merge_points, attr_filter))
ok = false;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment