[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/extend_face_id 8a0941b 12/12: Fixed merge_face_ref
From: |
Jimmy Aguilar Mena |
Subject: |
[Emacs-diffs] scratch/extend_face_id 8a0941b 12/12: Fixed merge_face_ref recursive calls. |
Date: |
Sat, 21 Sep 2019 14:54:29 -0400 (EDT) |
branch: scratch/extend_face_id
commit 8a0941bace6d0d8e8c29344ab59092dde677b047
Author: Jimmy Aguilar Mena <address@hidden>
Commit: Jimmy Aguilar Mena <address@hidden>
Fixed merge_face_ref recursive calls.
* src/xfaces.c (merge_face_ref) : Fixed recursive calls to consider
filter when CONSP (face_ref).
---
src/xdisp.c | 7 +++----
src/xfaces.c | 6 +++---
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/xdisp.c b/src/xdisp.c
index d685106..668b9b3 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -20463,7 +20463,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
@@ -20488,9 +20487,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 9a19154..75fbdd2 100644
--- 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;
}
}
- [Emacs-diffs] scratch/extend_face_id 1540994 04/12: Fixed extend face filtered for prop., (continued)
- [Emacs-diffs] scratch/extend_face_id 1540994 04/12: Fixed extend face filtered for prop., Jimmy Aguilar Mena, 2019/09/21
- [Emacs-diffs] scratch/extend_face_id 429237d 02/12: Added face parameter :extend., Jimmy Aguilar Mena, 2019/09/21
- [Emacs-diffs] scratch/extend_face_id bd602d7 08/12: Make hl-line face to extend all the line.., Jimmy Aguilar Mena, 2019/09/21
- [Emacs-diffs] scratch/extend_face_id 6162f0e 05/12: Changed handle_face_prop_general prototype., Jimmy Aguilar Mena, 2019/09/21
- [Emacs-diffs] scratch/extend_face_id 27ec06e 09/12: Added parameter attr_filter to face_at_string_position., Jimmy Aguilar Mena, 2019/09/21
- [Emacs-diffs] scratch/extend_face_id 849baf6 10/12: Extend_face simplify., Jimmy Aguilar Mena, 2019/09/21
- [Emacs-diffs] scratch/extend_face_id ed8a1fe 06/12: Add space for cursor to work also in terminal., Jimmy Aguilar Mena, 2019/09/21
- [Emacs-diffs] scratch/extend_face_id f228b7d 07/12: Fix last change in append_space_for_newline., Jimmy Aguilar Mena, 2019/09/21
- [Emacs-diffs] scratch/extend_face_id 9d7f863 03/12: Conditional merged face to extend after eol., Jimmy Aguilar Mena, 2019/09/21
- [Emacs-diffs] scratch/extend_face_id 9259267 11/12: Optimization in extend_face, Jimmy Aguilar Mena, 2019/09/21
- [Emacs-diffs] scratch/extend_face_id 8a0941b 12/12: Fixed merge_face_ref recursive calls.,
Jimmy Aguilar Mena <=