procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix last change in 'handle_display_prop'

Browse source 
* src/xdisp.c (handle_display_prop): Pass the window's buffer to
'display_min_width' and to 'handle_display_spec'.  (Bug#52385)
This commit is contained in:
Eli Zaretskii 2021-12-19 15:48:30 +02:00
parent 9ef9d0c697
commit ec692470bd
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/xdisp.c
View file

@ -5209,9 +5209,8 @@ find_display_property (Lisp_Object disp, Lisp_Object prop)
return Qnil;
}
static
Lisp_Object get_display_property (ptrdiff_t bufpos, Lisp_Object prop,
Lisp_Object object)
static Lisp_Object
get_display_property (ptrdiff_t bufpos, Lisp_Object prop, Lisp_Object object)
{
return find_display_property (Fget_text_property (make_fixnum (bufpos),
Qdisplay, object),
@ -5364,6 +5363,10 @@ handle_display_prop (struct it *it)
propval = get_char_property_and_overlay (make_fixnum (position->charpos),
Qdisplay, object, &overlay);
/* Rest of the code must have OBJECT be either a string or a buffer. */
if (!STRINGP (it->string))
object = it->w->contents;
/* Handle min-width ends. */
if (!NILP (it->min_width_property)
&& NILP (find_display_property (propval, Qmin_width)))
@ -5374,9 +5377,6 @@ 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));