diff options
| author | Kenichi Handa | 2010-02-26 10:17:28 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2010-02-26 10:17:28 +0900 |
| commit | 7379cfce157cbd68045970dafa92c6216ced84b3 (patch) | |
| tree | 242eac520b1f993d1a563fd2c2df5959c49f8c0c /src | |
| parent | ed20a012b845a6e6dc7b0c037e5cf0b8e54ab4d1 (diff) | |
| download | emacs-7379cfce157cbd68045970dafa92c6216ced84b3.tar.gz emacs-7379cfce157cbd68045970dafa92c6216ced84b3.zip | |
xdisp.c (reseat_to_string): Fix previous change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xdisp.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0b67340c1fd..8ad6941a806 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-02-26 Kenichi Handa <handa@m17n.org> | ||
| 2 | |||
| 3 | * xdisp.c (reseat_to_string): Fix previous change. | ||
| 4 | |||
| 1 | 2010-02-25 Kenichi Handa <handa@m17n.org> | 5 | 2010-02-25 Kenichi Handa <handa@m17n.org> |
| 2 | 6 | ||
| 3 | * xdisp.c (reseat_to_string): Fix previous change (bug#5609). | 7 | * xdisp.c (reseat_to_string): Fix previous change (bug#5609). |
diff --git a/src/xdisp.c b/src/xdisp.c index 1a078edd074..9ece458e77e 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -5611,7 +5611,7 @@ reseat_to_string (it, s, string, charpos, precision, field_width, multibyte) | |||
| 5611 | it->stop_charpos = charpos; | 5611 | it->stop_charpos = charpos; |
| 5612 | if (s == NULL && it->multibyte_p) | 5612 | if (s == NULL && it->multibyte_p) |
| 5613 | { | 5613 | { |
| 5614 | EMACS_INT endpos = charpos + SCHARS (it->string); | 5614 | EMACS_INT endpos = SCHARS (it->string); |
| 5615 | if (endpos > it->end_charpos) | 5615 | if (endpos > it->end_charpos) |
| 5616 | endpos = it->end_charpos; | 5616 | endpos = it->end_charpos; |
| 5617 | composition_compute_stop_pos (&it->cmp_it, charpos, -1, endpos, | 5617 | composition_compute_stop_pos (&it->cmp_it, charpos, -1, endpos, |