diff options
author | Eli Zaretskii <eliz@gnu.org> | 2020-07-30 16:56:36 +0300 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2020-07-30 16:56:36 +0300 |
commit | 35564bea4d73bc266743216599d01d644aed6fd8 (patch) | |
tree | 8f00c6199d19dceec8d4ad13b96c1a782f283f19 /lib/gettimeofday.c | |
parent | 50ea5b871dd264e3a7fd6c3977e021f1a365cb5f (diff) | |
download | emacs-35564bea4d73bc266743216599d01d644aed6fd8.tar.gz emacs-35564bea4d73bc266743216599d01d644aed6fd8.tar.bz2 emacs-35564bea4d73bc266743216599d01d644aed6fd8.zip |
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.
Diffstat (limited to 'lib/gettimeofday.c')
0 files changed, 0 insertions, 0 deletions