From cc6c7c75bbd87892ff3f956c75f5494d58f3fc33 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Thu, 25 Feb 2010 11:29:35 +0900 Subject: [PATCH] xdisp.c (reseat_to_string): Fix previous change (bug#5609). --- src/ChangeLog | 4 ++++ src/xdisp.c | 9 +++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 542a0781783..0b67340c1fd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2010-02-25 Kenichi Handa + + * xdisp.c (reseat_to_string): Fix previous change (bug#5609). + 2010-02-24 Jan Djärv * xterm.c (XTflash): Move declarations before statements. 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); } -- 2.39.5