From: Kenichi Handa <handa@m17n.org>
Date: Sat, 24 Jan 2004 05:00:26 +0000 (+0000)
Subject: (get_next_display_element): Pass -1 as POS to
X-Git-Tag: emacs-pretest-23.0.90~8295^2~1620
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=069315b7a1057457be78035387b9466b689a6800;p=emacs.git

(get_next_display_element): Pass -1 as POS to
FACE_FOR_CHAR if displaying a C-string.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 6b814c0e55a..7f0ebc57a22 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -4925,9 +4925,10 @@ get_next_display_element (it)
 	  && FRAME_WINDOW_P (it->f))
 	{
 	  struct face *face = FACE_FROM_ID (it->f, it->face_id);
-	  int pos = (STRINGP (it->string)
-		     ? IT_STRING_CHARPOS (*it) : IT_CHARPOS (*it));
-
+	  int pos = (it->s ? -1
+		     : STRINGP (it->string) ? IT_STRING_CHARPOS (*it)
+		     : IT_CHARPOS (*it));
+	  
 	  it->face_id = FACE_FOR_CHAR (it->f, face, it->c, pos, it->string);
 	}
     }