mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-05 11:21:04 -08:00
Code Issues Projects Releases Wiki Activity

Fix display of window-specific overlays with 'display' property

Browse source 
* src/xdisp.c (handle_display_prop): Pass the window to
'get_char_property_and_overlay', not the buffer.  (Bug#52385)
The assignment of the buffer to OBJECT was moved to before
the call to 'get_char_property_and_overlay', for unknown
reasons, as part of installing the support for the
'min-width' space spec.
This commit is contained in:
Eli Zaretskii 2021-12-18 11:03:48 +02:00
parent e5a74c20c3
commit 3fea95b79f
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/xdisp.c
View file

@ -5361,9 +5361,6 @@ handle_display_prop (struct it *it)
if (!it->string_from_display_prop_p)
it->area = TEXT_AREA;
if (!STRINGP (it->string))
object = it->w->contents;
propval = get_char_property_and_overlay (make_fixnum (position->charpos),
Qdisplay, object, &overlay);
@ -5377,6 +5374,9 @@ handle_display_prop (struct it *it)
/* Now OVERLAY is the overlay that gave us this property, or nil
if it was a text property. */
if (!STRINGP (it->string))
object = it->w->contents;
display_replaced = handle_display_spec (it, propval, object, overlay,
position, bufpos,
FRAME_WINDOW_P (it->f));