[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] feature/extend_face_id 1b2ae7b 06/19: Fixed extend face fi
From: |
Jimmy Aguilar Mena |
Subject: |
[Emacs-diffs] feature/extend_face_id 1b2ae7b 06/19: Fixed extend face filtered for prop. |
Date: |
Sun, 13 Oct 2019 18:07:32 -0400 (EDT) |
branch: feature/extend_face_id
commit 1b2ae7bf2f6d21e1e2d6becf9983f6c721f67d76
Author: Jimmy Aguilar Mena <address@hidden>
Commit: Jimmy Aguilar Mena <address@hidden>
Fixed extend face filtered for prop.
* src/xfaces.c (face_at_buffer_position): Pass ATTR_FILTER to
merge_face_ref in when !NILP (prop).
---
src/xdisp.c | 13 ++++---------
src/xfaces.c | 4 ++--
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/src/xdisp.c b/src/xdisp.c
index 1f47464..2195f33 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -4149,17 +4149,12 @@ handle_fontified_prop (struct it *it)
***********************************************************************/
static enum prop_handled
-handle_face_prop_general (struct it *it,
+handle_face_prop_general (struct it *it, int *face_id_ptr,
enum lface_attribute_index attr_filter)
{
- int new_face_id, *face_id_ptr;
+ int new_face_id;
ptrdiff_t next_stop;
- if (attr_filter == LFACE_EXTEND_INDEX)
- face_id_ptr = &(it->extend_face_id);
- else
- face_id_ptr = &(it->face_id);
-
if (!STRINGP (it->string))
{
new_face_id
@@ -4313,7 +4308,7 @@ handle_face_prop_general (struct it *it,
static enum prop_handled
handle_face_prop (struct it *it)
{
- return handle_face_prop_general (it, 0);
+ return handle_face_prop_general (it, &(it->face_id), 0);
}
@@ -21605,7 +21600,7 @@ extend_face_to_end_of_line (struct it *it)
|| WINDOW_RIGHT_MARGIN_WIDTH (it->w) > 0))
return;
- handle_face_prop_general (it, LFACE_EXTEND_INDEX);
+ handle_face_prop_general (it, &(it->extend_face_id), LFACE_EXTEND_INDEX);
/* Face extension extends the background and box of IT->extend_face_id
to the end of the line. If the background equals the background
diff --git a/src/xfaces.c b/src/xfaces.c
index 189ba1e..d3851d0 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -6133,11 +6133,11 @@ face_at_buffer_position (struct window *w, ptrdiff_t
pos,
}
/* Begin with attributes from the default face. */
- memcpy (attrs, default_face->lface, sizeof attrs);
+ memcpy (attrs, default_face->lface, sizeof(attrs));
/* Merge in attributes specified via text properties. */
if (!NILP (prop))
- merge_face_ref (w, f, prop, attrs, true, NULL, 0);
+ merge_face_ref (w, f, prop, attrs, true, NULL, attr_filter);
/* Now merge the overlay data. */
noverlays = sort_overlays (overlay_vec, noverlays, w);
- [Emacs-diffs] branch feature/extend_face_id created (now 5aad1a8), Jimmy Aguilar Mena, 2019/10/13
- [Emacs-diffs] feature/extend_face_id a752bad 01/19: Simplify struct face to use only underline., Jimmy Aguilar Mena, 2019/10/13
- [Emacs-diffs] feature/extend_face_id e2629c6 02/19: Added face parameter :extend., Jimmy Aguilar Mena, 2019/10/13
- [Emacs-diffs] feature/extend_face_id 89b5668 04/19: Update dfci code with new extend_face code., Jimmy Aguilar Mena, 2019/10/13
- [Emacs-diffs] feature/extend_face_id 1b2ae7b 06/19: Fixed extend face filtered for prop.,
Jimmy Aguilar Mena <=
- [Emacs-diffs] feature/extend_face_id ca116c3 05/19: Call handle_face_prop_general to extend face., Jimmy Aguilar Mena, 2019/10/13
- [Emacs-diffs] feature/extend_face_id 02e5564 07/19: Changed handle_face_prop_general prototype., Jimmy Aguilar Mena, 2019/10/13
- [Emacs-diffs] feature/extend_face_id 4e37688 10/19: Extend face hl-line after end-of-line, Jimmy Aguilar Mena, 2019/10/13
- [Emacs-diffs] feature/extend_face_id 5bbd540 11/19: Added parameter attr_filter to face_at_string_position., Jimmy Aguilar Mena, 2019/10/13
- [Emacs-diffs] feature/extend_face_id 8df1e5f 13/19: Optimization in extend_face, Jimmy Aguilar Mena, 2019/10/13
- [Emacs-diffs] feature/extend_face_id e9b2a69 03/19: New parameter to control the face extension.., Jimmy Aguilar Mena, 2019/10/13
- [Emacs-diffs] feature/extend_face_id 943b093 09/19: Fix last change in append_space_for_newline., Jimmy Aguilar Mena, 2019/10/13
- [Emacs-diffs] feature/extend_face_id b770fcd 08/19: Add space for cursor to work also in terminal., Jimmy Aguilar Mena, 2019/10/13
- [Emacs-diffs] feature/extend_face_id c82cf17 12/19: Extend_face simplify., Jimmy Aguilar Mena, 2019/10/13
- [Emacs-diffs] feature/extend_face_id 1112779 15/19: Document new :extend face attribute in manuals., Jimmy Aguilar Mena, 2019/10/13