projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ed20a01
)
xdisp.c (reseat_to_string): Fix previous change.
author
Kenichi Handa
<handa@m17n.org>
Fri, 26 Feb 2010 01:17:28 +0000
(10:17 +0900)
committer
Kenichi Handa
<handa@m17n.org>
Fri, 26 Feb 2010 01:17:28 +0000
(10:17 +0900)
src/ChangeLog
patch
|
blob
|
history
src/xdisp.c
patch
|
blob
|
history
diff --git
a/src/ChangeLog
b/src/ChangeLog
index 0b67340c1fd1035addae2cddf9bff06d824647ec..8ad6941a80679985041adab4fb5630e05823c1ab 100644
(file)
--- a/
src/ChangeLog
+++ b/
src/ChangeLog
@@
-1,3
+1,7
@@
+2010-02-26 Kenichi Handa <handa@m17n.org>
+
+ * xdisp.c (reseat_to_string): Fix previous change.
+
2010-02-25 Kenichi Handa <handa@m17n.org>
* xdisp.c (reseat_to_string): Fix previous change (bug#5609).
diff --git
a/src/xdisp.c
b/src/xdisp.c
index 1a078edd074745304cb0aa04e5b0cf20c14ef3e1..9ece458e77eb3cb1feea31f88016bbaf049693c6 100644
(file)
--- 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,