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 /test/lisp/emacs-lisp/cl-extra-tests.el | |
| parent | 63f614d76c115d1d4af447ce90177cf0183b5757 (diff) | |
| download | emacs-f946e48bf5bfe051e77eee4c3c19633cbbb6e8c2.tar.gz emacs-f946e48bf5bfe051e77eee4c3c19633cbbb6e8c2.tar.bz2 emacs-f946e48bf5bfe051e77eee4c3c19633cbbb6e8c2.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.
(cherry picked from commit 35564bea4d73bc266743216599d01d644aed6fd8)
Diffstat (limited to 'test/lisp/emacs-lisp/cl-extra-tests.el')
0 files changed, 0 insertions, 0 deletions