From: Kenichi Handa <handa@m17n.org>
Date: Fri, 26 Feb 2010 01:17:28 +0000 (+0900)
Subject: xdisp.c (reseat_to_string): Fix previous change.
X-Git-Tag: emacs-pretest-23.1.93~8
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7379cfce157cbd68045970dafa92c6216ced84b3;p=emacs.git

xdisp.c (reseat_to_string): Fix previous change.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 0b67340c1fd..8ad6941a806 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-26  Kenichi Handa  <handa@m17n.org>
+
+	* xdisp.c (reseat_to_string): Fix previous change.
+
 2010-02-25  Kenichi Handa  <handa@m17n.org>
 
 	* xdisp.c (reseat_to_string): Fix previous change (bug#5609).
diff --git a/src/xdisp.c b/src/xdisp.c
index 1a078edd074..9ece458e77e 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5611,7 +5611,7 @@ reseat_to_string (it, s, string, charpos, precision, field_width, multibyte)
   it->stop_charpos = charpos;
   if (s == NULL && it->multibyte_p)
     {
-      EMACS_INT endpos = charpos + SCHARS (it->string);
+      EMACS_INT endpos = SCHARS (it->string);
       if (endpos > it->end_charpos)
 	endpos = it->end_charpos;
       composition_compute_stop_pos (&it->cmp_it, charpos, -1, endpos,