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

Fixed merge_face_ref recursive calls.

Browse source 
* src/xfaces.c (merge_face_ref): Fixed recursive calls to consider
filter when CONSP (face_ref).
This commit is contained in:
Jimmy Aguilar Mena 2019-09-21 20:33:38 +02:00
parent 92445de0a4
commit 38ee12d5a2
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/xdisp.c
View file

@ -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)

6
src/xfaces.c
View file

@ -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;
}
}