[Emacs-diffs] /srv/bzr/emacs/trunk r99555: xdisp.c (reseat_to_string): Fix previous change (bug#5609).

[Kenichi Handa]

------------------------------------------------------------
revno: 99555 [merge]
committer: Kenichi Handa  <address@hidden>
branch nick: trunk
timestamp: Thu 2010-02-25 11:32:53 +0900
message:
  xdisp.c (reseat_to_string): Fix previous change (bug#5609).
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-02-24 18:23:48 +0000
+++ b/src/ChangeLog     2010-02-25 02:29:35 +0000
@@ -1,3 +1,7 @@
+2010-02-25  Kenichi Handa  <address@hidden>
+
+       * xdisp.c (reseat_to_string): Fix previous change (bug#5609).
+
 2010-02-24  Jan Djärv  <address@hidden>
 
        * xterm.c (XTflash): Move declarations before statements.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2010-01-23 05:20:38 +0000
+++ b/src/xdisp.c       2010-02-25 02:29:35 +0000
@@ -5610,8 +5610,13 @@
 
   it->stop_charpos = charpos;
   if (s == NULL && it->multibyte_p)
-    composition_compute_stop_pos (&it->cmp_it, charpos, -1, it->end_charpos,
-                                 it->string);
+    {
+      EMACS_INT endpos = charpos + SCHARS (it->string);
+      if (endpos > it->end_charpos)
+       endpos = it->end_charpos;
+      composition_compute_stop_pos (&it->cmp_it, charpos, -1, endpos,
+                                   it->string);
+    }
   CHECK_IT (it);
 }