]> git.eshelyaron.com Git - emacs.git/commitdiff
(get_next_display_element): Pass -1 as POS to
authorKenichi Handa <handa@m17n.org>
Sat, 24 Jan 2004 05:00:26 +0000 (05:00 +0000)
committerKenichi Handa <handa@m17n.org>
Sat, 24 Jan 2004 05:00:26 +0000 (05:00 +0000)
FACE_FOR_CHAR if displaying a C-string.

src/xdisp.c

index 6b814c0e55a137bbc0cea22ba966bcdf8de0003a..7f0ebc57a22615d459f95373eab42b4d635824b1 100644 (file)
@@ -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);
        }
     }