aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa <[email protected]>2010-02-26 10:17:28 +0900
committerKenichi Handa <[email protected]>2010-02-26 10:17:28 +0900
commit7379cfce157cbd68045970dafa92c6216ced84b3 (patch)
tree242eac520b1f993d1a563fd2c2df5959c49f8c0c /src
parented20a012b845a6e6dc7b0c037e5cf0b8e54ab4d1 (diff)
xdisp.c (reseat_to_string): Fix previous change.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xdisp.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 0b67340c1f..8ad6941a80 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-26 Kenichi Handa <[email protected]>
+
+ * xdisp.c (reseat_to_string): Fix previous change.
+
2010-02-25 Kenichi Handa <[email protected]>
* xdisp.c (reseat_to_string): Fix previous change (bug#5609).
diff --git a/src/xdisp.c b/src/xdisp.c
index 1a078edd07..9ece458e77 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5611,7 +5611,7 @@ reseat_to_string (it, s, string, charpos, precision, field_width, multibyte)
it->stop_charpos = charpos;
if (s == NULL && it->multibyte_p)
{
- EMACS_INT endpos = charpos + SCHARS (it->string);
+ EMACS_INT endpos = SCHARS (it->string);
if (endpos > it->end_charpos)
endpos = it->end_charpos;
composition_compute_stop_pos (&it->cmp_it, charpos, -1, endpos,