[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] feature/extend_face_id 9750a03 12/15: Fixed merge_face_ref
From: |
Jimmy Aguilar Mena |
Subject: |
[Emacs-diffs] feature/extend_face_id 9750a03 12/15: Fixed merge_face_ref recursive calls. |
Date: |
Wed, 9 Oct 2019 10:53:13 -0400 (EDT) |
branch: feature/extend_face_id
commit 9750a037439f719b7ead870ce23d105d1b63e9a0
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 20c44bf..1cb1538 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -21566,7 +21566,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
@@ -21591,9 +21590,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] branch feature/extend_face_id created (now 0a7b2b0), Jimmy Aguilar Mena, 2019/10/09
- [Emacs-diffs] feature/extend_face_id 92e9f9d 02/15: Added face parameter :extend., Jimmy Aguilar Mena, 2019/10/09
- [Emacs-diffs] feature/extend_face_id e4761a2 07/15: Fix last change in append_space_for_newline., Jimmy Aguilar Mena, 2019/10/09
- [Emacs-diffs] feature/extend_face_id bc9905a 11/15: Optimization in extend_face, Jimmy Aguilar Mena, 2019/10/09
- [Emacs-diffs] feature/extend_face_id 9750a03 12/15: Fixed merge_face_ref recursive calls.,
Jimmy Aguilar Mena <=
- [Emacs-diffs] feature/extend_face_id 111dcf8 01/15: Simplify struct face to use only underline., Jimmy Aguilar Mena, 2019/10/09
- [Emacs-diffs] feature/extend_face_id d8cb394 08/15: Make hl-line face to extend all the line.., Jimmy Aguilar Mena, 2019/10/09
- [Emacs-diffs] feature/extend_face_id 41d6d91 04/15: Fixed extend face filtered for prop., Jimmy Aguilar Mena, 2019/10/09
- [Emacs-diffs] feature/extend_face_id d5ded9d 03/15: Conditional merged face to extend after eol., Jimmy Aguilar Mena, 2019/10/09
- [Emacs-diffs] feature/extend_face_id 567644e 06/15: Add space for cursor to work also in terminal., Jimmy Aguilar Mena, 2019/10/09
- [Emacs-diffs] feature/extend_face_id 9fa74c4 05/15: Changed handle_face_prop_general prototype., Jimmy Aguilar Mena, 2019/10/09
- [Emacs-diffs] feature/extend_face_id 834e23f 09/15: Added parameter attr_filter to face_at_string_position., Jimmy Aguilar Mena, 2019/10/09
- [Emacs-diffs] feature/extend_face_id ae9787b 10/15: Extend_face simplify., Jimmy Aguilar Mena, 2019/10/09
- [Emacs-diffs] feature/extend_face_id 19801c2 14/15: * etc/NEWS : Added comment about :extend face attribute in NEWS., Jimmy Aguilar Mena, 2019/10/09
- [Emacs-diffs] feature/extend_face_id 6b50c01 13/15: Document new :extend face attribute in manuals., Jimmy Aguilar Mena, 2019/10/09