[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 38ee12d 14/20: Fixed merge_face_ref recursive calls
From: |
Jimmy Aguilar Mena |
Subject: |
[Emacs-diffs] master 38ee12d 14/20: Fixed merge_face_ref recursive calls. |
Date: |
Mon, 14 Oct 2019 08:32:33 -0400 (EDT) |
branch: master
commit 38ee12d5a2df150e6ba9023d968d1c49c85ca6e1
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 d99bc43..2c69a1f 100644
--- 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 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] master 42bbfd2 04/20: Update dfci code with new extend_face code., (continued)
- [Emacs-diffs] master 42bbfd2 04/20: Update dfci code with new extend_face code., Jimmy Aguilar Mena, 2019/10/14
- [Emacs-diffs] master 424e6f5 15/20: Document new :extend face attribute in manuals., Jimmy Aguilar Mena, 2019/10/14
- [Emacs-diffs] master 0cf11eb 16/20: *etc/NEWS: Added comment about :extend face attribute in NEWS., Jimmy Aguilar Mena, 2019/10/14
- [Emacs-diffs] master faa9b06 05/20: Call handle_face_prop_general to extend face., Jimmy Aguilar Mena, 2019/10/14
- [Emacs-diffs] master e1b5e80 10/20: Extend face hl-line after end-of-line, Jimmy Aguilar Mena, 2019/10/14
- [Emacs-diffs] master 7a10082 19/20: Fix issue calling face_at_pos., Jimmy Aguilar Mena, 2019/10/14
- [Emacs-diffs] master bc8db39 02/20: Added face parameter :extend., Jimmy Aguilar Mena, 2019/10/14
- [Emacs-diffs] master cc47cd4 17/20: ; extend_face_id and fill_column_indicator corrections, Jimmy Aguilar Mena, 2019/10/14
- [Emacs-diffs] master 95d1c3b 08/20: Add space for cursor to work also in terminal., Jimmy Aguilar Mena, 2019/10/14
- [Emacs-diffs] master 501846c 18/20: Modify face_at_pos to not modify change IT., Jimmy Aguilar Mena, 2019/10/14
- [Emacs-diffs] master 38ee12d 14/20: Fixed merge_face_ref recursive calls.,
Jimmy Aguilar Mena <=
- [Emacs-diffs] master ab22720 09/20: Fix last change in append_space_for_newline., Jimmy Aguilar Mena, 2019/10/14
- [Emacs-diffs] master 3d6075e 20/20: Merge branch 'feature/extend_face_id', Jimmy Aguilar Mena, 2019/10/14