From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 6 Mar 2019 19:06:00 +0000 (+0200)
Subject: Fix OBJECT binding in conditional display specs
X-Git-Tag: emacs-27.0.90~3463
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a0b2a5ad9ec8186b679ee80e1c5b9786672344a0;p=emacs.git

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)
---

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;