From: Kenichi Handa Date: Tue, 9 Sep 2008 11:09:31 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: emacs-pretest-23.0.90~2944 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6450412dcf180276752b5f03058d3d0c7fa4ddc7;p=emacs.git *** empty log message *** --- 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 diff --git a/src/dispextern.h b/src/dispextern.h index 02b9df08eb5..9b6b6a9de3b 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -1867,7 +1867,9 @@ struct composition_it int id; /* If non-negative, character that triggers the automatic composition at `stop_pos', and this is an automatic compositoin. - If negative, this is a static composition.. */ + If negative, this is a static composition. This is set to -2 + temporarily if searching of composition reach a limit or a + newline. */ int ch; /* If this an automatic composition, how many charaters to look back from the position where a character triggering the composition