Commit cc6c7c75 authored by Kenichi Handa's avatar Kenichi Handa

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

parent 0ca10bb7
2010-02-25 Kenichi Handa <handa@m17n.org>
* xdisp.c (reseat_to_string): Fix previous change (bug#5609).
2010-02-24 Jan Djärv <jan.h.d@swipnet.se>
* xterm.c (XTflash): Move declarations before statements.
......
......@@ -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);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment