Commit a0b2a5ad authored by Eli Zaretskii's avatar Eli Zaretskii

Fix OBJECT binding in conditional display specs

* src/xdisp.c (compute_display_string_pos): Pass OBJECT1, not
OBJECT to handle_display_spec, as the latter doesn't expect a
window object.  (Bug#34771)
parent 2260e48d
......@@ -3761,7 +3761,7 @@ compute_display_string_pos (struct text_pos *position,
|| !EQ (Fget_char_property (make_fixnum (charpos - 1), Qdisplay,
object),
spec))
&& (rv = handle_display_spec (NULL, spec, object, Qnil, &tpos, bufpos,
&& (rv = handle_display_spec (NULL, spec, object1, Qnil, &tpos, bufpos,
frame_window_p)))
{
if (rv == 2)
......@@ -3788,7 +3788,7 @@ compute_display_string_pos (struct text_pos *position,
if (!STRINGP (object))
bufpos = CHARPOS (tpos);
} while (NILP (spec)
|| !(rv = handle_display_spec (NULL, spec, object, Qnil, &tpos,
|| !(rv = handle_display_spec (NULL, spec, object1, Qnil, &tpos,
bufpos, frame_window_p)));
if (rv == 2)
*disp_prop = 2;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment