xdisp.c (reseat_to_string): Fix previous change (bug#5609).

1 files changed, 7 insertions, 2 deletions

diff --git a/src/xdisp.c b/src/xdisp.c
index 8e356224c8a..1a078edd074 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5610,8 +5610,13 @@ reseat_to_string (it, s, string, charpos, precision, field_width, multibyte)
 
   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);
 }