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) ...@@ -20473,7 +20473,6 @@ append_space_for_newline (struct it *it, bool default_face_p)
static void static void
extend_face_to_end_of_line (struct it *it) extend_face_to_end_of_line (struct it *it)
{ {
struct face *face;
struct frame *f = it->f; struct frame *f = it->f;
/* If line is already filled, do nothing. Non window-system frames /* If line is already filled, do nothing. Non window-system frames
...@@ -20498,9 +20497,9 @@ extend_face_to_end_of_line (struct it *it) ...@@ -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 /* Face extension extends the background and box of IT->extend_face_id
to the end of the line. If the background equals the background to the end of the line. If the background equals the background
of the frame, we don't have to do anything. */ of the frame, we don't have to do anything. */
face = FACE_FROM_ID (f, (it->face_before_selective_p struct face *face = FACE_FROM_ID (f, (it->face_before_selective_p
? it->saved_face_id ? it->saved_face_id
: extend_face_id)); : extend_face_id));
if (FRAME_WINDOW_P (f) if (FRAME_WINDOW_P (f)
&& MATRIX_ROW_DISPLAYS_TEXT_P (it->glyph_row) && MATRIX_ROW_DISPLAYS_TEXT_P (it->glyph_row)
...@@ -2529,7 +2529,7 @@ merge_face_ref (struct window *w, ...@@ -2529,7 +2529,7 @@ merge_face_ref (struct window *w,
normal face reference. */ normal face reference. */
if (! merge_face_ref (w, f, value, to, if (! merge_face_ref (w, f, value, to,
err_msgs, named_merge_points, err_msgs, named_merge_points,
0)) attr_filter))
err = true; err = true;
} }
else if (EQ (keyword, QCextend)) else if (EQ (keyword, QCextend))
...@@ -2560,10 +2560,10 @@ merge_face_ref (struct window *w, ...@@ -2560,10 +2560,10 @@ merge_face_ref (struct window *w,
if (! NILP (next)) if (! NILP (next))
ok = merge_face_ref (w, f, next, to, err_msgs, 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, if (! merge_face_ref (w, f, first, to, err_msgs,
named_merge_points, 0)) named_merge_points, attr_filter))
ok = false; 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