Fixed merge_face_ref recursive calls.

* src/xfaces.c (merge_face_ref): Fixed recursive calls to consider
filter when CONSP (face_ref).

diff --git a/src/xdisp.c b/src/xdisp.c
index d99bc4323df26c29c41c612a655c47e22e20eaf4..2c69a1f04f1342977496110956340996bc39bb4e 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -21563,7 +21563,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
@@ -21588,9 +21587,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));
 
   if (FRAME_WINDOW_P (f)
       && MATRIX_ROW_DISPLAYS_TEXT_P (it->glyph_row)

diff --git a/src/xfaces.c b/src/xfaces.c
index 082019d74e6cbf746d615eadbb3291695753866a..5577640325d10c22c74eab44de22dbc7ab5ae99c 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -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,
-                                       0))
+                                       attr_filter))
                    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;
        }
     }