diff options
author | Eli Zaretskii <eliz@gnu.org> | 2019-03-06 21:06:00 +0200 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2019-03-06 21:06:00 +0200 |
commit | a0b2a5ad9ec8186b679ee80e1c5b9786672344a0 (patch) | |
tree | 58f23c5f17791f34afd6361161e2c8267c4406eb /src/xdisp.c | |
parent | 2260e48d2eeaa9ea2b9c17389cc25d00f85c414c (diff) | |
download | emacs-a0b2a5ad9ec8186b679ee80e1c5b9786672344a0.tar.gz |
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)
Diffstat (limited to 'src/xdisp.c')
-rw-r--r-- | src/xdisp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index 6ceb5c9e51a..0af5e39dfb6 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -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; |