mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-06 03:40:56 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Kenichi Handa 2010-02-25 11:29:35 +09:00
parent 0ca10bb75f
commit cc6c7c75bb
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
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.

9
src/xdisp.c
View file

@ -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);
}