[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] feature/extend_face_id 579134d 14/19: Fixed merge_face_ref
From: |
Jimmy Aguilar Mena |
Subject: |
[Emacs-diffs] feature/extend_face_id 579134d 14/19: Fixed merge_face_ref recursive calls. |
Date: |
Sun, 13 Oct 2019 17:29:59 -0400 (EDT) |
branch: feature/extend_face_id
commit 579134d73f22e36ce92b934ae80166eb63c6c446
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 67d6f14..1ecd912 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -21570,7 +21570,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
@@ -21595,9 +21594,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 082019d..5577640 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] feature/extend_face_id 50c0cca 01/19: Simplify struct face to use only underline., (continued)
- [Emacs-diffs] feature/extend_face_id 50c0cca 01/19: Simplify struct face to use only underline., Jimmy Aguilar Mena, 2019/10/13
- [Emacs-diffs] feature/extend_face_id 5c1bfd8 07/19: Changed handle_face_prop_general prototype., Jimmy Aguilar Mena, 2019/10/13
- [Emacs-diffs] feature/extend_face_id 4a4752a 02/19: Added face parameter :extend., Jimmy Aguilar Mena, 2019/10/13
- [Emacs-diffs] feature/extend_face_id f3f0a28 05/19: WIP: BUG HERE, Jimmy Aguilar Mena, 2019/10/13
- [Emacs-diffs] feature/extend_face_id 719fd61 06/19: Fixed extend face filtered for prop., Jimmy Aguilar Mena, 2019/10/13
- [Emacs-diffs] feature/extend_face_id 14f65d4 08/19: Add space for cursor to work also in terminal., Jimmy Aguilar Mena, 2019/10/13
- [Emacs-diffs] feature/extend_face_id 575c65d 18/19: Modify face_at_pos to not modify change IT., Jimmy Aguilar Mena, 2019/10/13
- [Emacs-diffs] feature/extend_face_id 06048fb 15/19: Document new :extend face attribute in manuals., Jimmy Aguilar Mena, 2019/10/13
- [Emacs-diffs] feature/extend_face_id 7f68e80 17/19: ; extend_face_id and fill_column_indicator corrections, Jimmy Aguilar Mena, 2019/10/13
- [Emacs-diffs] feature/extend_face_id 87f80cf 19/19: Fix issue when calling face_at_pos., Jimmy Aguilar Mena, 2019/10/13
- [Emacs-diffs] feature/extend_face_id 579134d 14/19: Fixed merge_face_ref recursive calls.,
Jimmy Aguilar Mena <=
- [Emacs-diffs] feature/extend_face_id cf0b7e2 12/19: Extend_face simplify., Jimmy Aguilar Mena, 2019/10/13
- [Emacs-diffs] feature/extend_face_id 077e488 11/19: Added parameter attr_filter to face_at_string_position., Jimmy Aguilar Mena, 2019/10/13
- [Emacs-diffs] feature/extend_face_id 372047a 03/19: New parameter to control the face extension.., Jimmy Aguilar Mena, 2019/10/13
- [Emacs-diffs] feature/extend_face_id e5076c9 16/19: * etc/NEWS : Added comment about :extend face attribute in NEWS., Jimmy Aguilar Mena, 2019/10/13
- [Emacs-diffs] feature/extend_face_id 1b12eca 13/19: Optimization in extend_face, Jimmy Aguilar Mena, 2019/10/13
- [Emacs-diffs] feature/extend_face_id 666b687 10/19: Make hl-line face to extend all the line.., Jimmy Aguilar Mena, 2019/10/13
- [Emacs-diffs] feature/extend_face_id 5ddf21e 04/19: Update dfci code with new extend_face attribute., Jimmy Aguilar Mena, 2019/10/13
- [Emacs-diffs] feature/extend_face_id d6afc87 09/19: Fix last change in append_space_for_newline., Jimmy Aguilar Mena, 2019/10/13