1 files changed, 4 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a4fbe0de2a1..6edb7419eb8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -5,6 +5,10 @@
 
         * composite.c (FORWARD_CHAR): Fix calculation
         of (POSITION).pos_byte.
+        (composition_compute_stop_pos): Limit the search of composition to
+        at most 500 characters ahead.  If we reach the limit or find a
+        newline, set cmp_it->ch to -2 and return 0.
+        (composition_reseat_it): Handle the case that cmp_it->ch is -2.
 
 2008-09-08  Kenichi Handa  <handa@m17n.org>