diff options
| author | Eli Zaretskii | 2019-03-06 21:06:00 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2019-03-06 21:06:00 +0200 |
| commit | a0b2a5ad9ec8186b679ee80e1c5b9786672344a0 (patch) | |
| tree | 58f23c5f17791f34afd6361161e2c8267c4406eb /src | |
| parent | 2260e48d2eeaa9ea2b9c17389cc25d00f85c414c (diff) | |
| download | emacs-a0b2a5ad9ec8186b679ee80e1c5b9786672344a0.tar.gz emacs-a0b2a5ad9ec8186b679ee80e1c5b9786672344a0.zip | |
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')
| -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, | |||
| 3761 | || !EQ (Fget_char_property (make_fixnum (charpos - 1), Qdisplay, | 3761 | || !EQ (Fget_char_property (make_fixnum (charpos - 1), Qdisplay, |
| 3762 | object), | 3762 | object), |
| 3763 | spec)) | 3763 | spec)) |
| 3764 | && (rv = handle_display_spec (NULL, spec, object, Qnil, &tpos, bufpos, | 3764 | && (rv = handle_display_spec (NULL, spec, object1, Qnil, &tpos, bufpos, |
| 3765 | frame_window_p))) | 3765 | frame_window_p))) |
| 3766 | { | 3766 | { |
| 3767 | if (rv == 2) | 3767 | if (rv == 2) |
| @@ -3788,7 +3788,7 @@ compute_display_string_pos (struct text_pos *position, | |||
| 3788 | if (!STRINGP (object)) | 3788 | if (!STRINGP (object)) |
| 3789 | bufpos = CHARPOS (tpos); | 3789 | bufpos = CHARPOS (tpos); |
| 3790 | } while (NILP (spec) | 3790 | } while (NILP (spec) |
| 3791 | || !(rv = handle_display_spec (NULL, spec, object, Qnil, &tpos, | 3791 | || !(rv = handle_display_spec (NULL, spec, object1, Qnil, &tpos, |
| 3792 | bufpos, frame_window_p))); | 3792 | bufpos, frame_window_p))); |
| 3793 | if (rv == 2) | 3793 | if (rv == 2) |
| 3794 | *disp_prop = 2; | 3794 | *disp_prop = 2; |