From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 4 Sep 2001 01:02:16 +0000 (+0000)
Subject: (handle_single_display_prop): Fix for int/Lisp_Object mixup.
X-Git-Tag: emacs-pretest-21.0.106~267
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=31ac723b3940257494af1eca3afd2feaac5534e1;p=emacs.git

(handle_single_display_prop): Fix for int/Lisp_Object mixup.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 8b3fc8ea654..4e4f54f1d3d 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2824,10 +2824,10 @@ handle_single_display_prop (it, prop, object, position,
 	 object where the property was found, and `buffer-position'
 	 to the current position in the buffer.  */
       specbind (Qobject, object);
-      specbind (Qposition, CHARPOS (*position));
-      specbind (Qbuffer_position, (STRINGP (object)
-				   ? make_number (IT_CHARPOS (*it))
-				   : make_number (CHARPOS (*position))));
+      specbind (Qposition, make_number (CHARPOS (*position)));
+      specbind (Qbuffer_position,
+		make_number (STRINGP (object)
+			     ? IT_CHARPOS (*it) : CHARPOS (*position)));
       GCPRO1 (form);
       form = safe_eval (form);
       UNGCPRO;