diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2020-07-30 16:56:36 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2020-08-13 16:38:44 +0300 |
| commit | f946e48bf5bfe051e77eee4c3c19633cbbb6e8c2 (patch) | |
| tree | 6e1e65e86cb7eae8ab8593348266d125c5cce9f2 /src/dispextern.h | |
| parent | 63f614d76c115d1d4af447ce90177cf0183b5757 (diff) | |
| download | emacs-f946e48bf5bfe051e77eee4c3c19633cbbb6e8c2.tar.gz | |
Fix face extension past EOL in overlay strings
* src/xdisp.c (face_at_pos): Pass ATTR_FILTER to
face_for_overlay_string.
* src/xfaces.c (face_for_overlay_string): Accept an additional
argument ATTR_INDEX and pass it to merge_face_ref for merging the
face at POS. This ensures a face from buffer text will not be
merged unless it specifies the :extend attribute. (Bug#42552)
* src/dispextern.h (face_for_overlay_string): Adjust prototype.
(cherry picked from commit 35564bea4d73bc266743216599d01d644aed6fd8)
Diffstat (limited to 'src/dispextern.h')
| -rw-r--r-- | src/dispextern.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index 724aad4227e..6b72e68d315 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -3559,7 +3559,7 @@ void recompute_basic_faces (struct frame *); int face_at_buffer_position (struct window *, ptrdiff_t, ptrdiff_t *, ptrdiff_t, bool, int, enum lface_attribute_index); int face_for_overlay_string (struct window *, ptrdiff_t, ptrdiff_t *, ptrdiff_t, - bool, Lisp_Object); + bool, Lisp_Object, enum lface_attribute_index); int face_at_string_position (struct window *, Lisp_Object, ptrdiff_t, ptrdiff_t, ptrdiff_t *, enum face_id, bool, enum lface_attribute_index); |