From: Kenichi Handa <handa@m17n.org>
Date: Mon, 12 Sep 2005 11:51:55 +0000 (+0000)
Subject: (display_mode_element): Be sure to make variables THIS
X-Git-Tag: emacs-pretest-22.0.90~7148
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5add1986c08021e0abcbbf3b4d9266c721c0988b;p=emacs.git

(display_mode_element): Be sure to make variables THIS
and LISP_STRING point into a string data of ELT.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 633d594ed77..061e1d87701 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-12  Kenichi Handa  <handa@m17n.org>
+
+	* xdisp.c (display_mode_element): Be sure to make variables THIS
+	and LISP_STRING point into a string data of ELT.
+
 2005-09-12  Kim F. Storm  <storm@cua.dk>
 
 	* editfns.c (Ftranslate_region_internal): Reload `tt' after
diff --git a/src/xdisp.c b/src/xdisp.c
index f06121a475c..a07e50aba89 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -16171,6 +16171,8 @@ display_mode_element (it, depth, field_width, precision, elt, props, risky)
 		else /* c == 0 */
 		  break;
 	      }
+	    this += SDATA (elt) - lisp_string;
+	    lisp_string = SDATA (elt);
 	  }
       }
       break;