[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/extend_face_id b307a5c 4/8: Fixed extend face filt
From: |
Jimmy Aguilar Mena |
Subject: |
[Emacs-diffs] scratch/extend_face_id b307a5c 4/8: Fixed extend face filtered for prop. |
Date: |
Sat, 14 Sep 2019 18:01:42 -0400 (EDT) |
branch: scratch/extend_face_id
commit b307a5c23503254530a980a6fb61b14694c0ff98
Author: Jimmy Aguilar Mena <address@hidden>
Commit: Jimmy Aguilar Mena <address@hidden>
Fixed extend face filtered for 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 45166e4..01dca84 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -4106,17 +4106,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
@@ -4270,7 +4265,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);
}
@@ -20498,7 +20493,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 7c5a085..4b3f2b2 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -6129,11 +6129,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 scratch/extend_face_id created (now 87bf154), Jimmy Aguilar Mena, 2019/09/14
- [Emacs-diffs] scratch/extend_face_id 87bf154 8/8: Make hl-line face to extend all the line.., Jimmy Aguilar Mena, 2019/09/14
- [Emacs-diffs] scratch/extend_face_id e0e3aa7 7/8: Fix last change in append_space_for_newline., Jimmy Aguilar Mena, 2019/09/14
- [Emacs-diffs] scratch/extend_face_id da9c131 5/8: Changed handle_face_prop_general prototype., Jimmy Aguilar Mena, 2019/09/14
- [Emacs-diffs] scratch/extend_face_id 7ef4f12 1/8: Simplify struct face to use only underline., Jimmy Aguilar Mena, 2019/09/14
- [Emacs-diffs] scratch/extend_face_id 1958094 2/8: Added face parameter :extend., Jimmy Aguilar Mena, 2019/09/14
- [Emacs-diffs] scratch/extend_face_id 61a8bcc 3/8: Conditional merged face to extend after eol., Jimmy Aguilar Mena, 2019/09/14
- [Emacs-diffs] scratch/extend_face_id cae56f9 6/8: Add space for cursor to work also in terminal., Jimmy Aguilar Mena, 2019/09/14
- [Emacs-diffs] scratch/extend_face_id b307a5c 4/8: Fixed extend face filtered for prop.,
Jimmy Aguilar Mena <=