Fix bidi-composition interaction.

1 files changed, 19 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c0e37f70c9c..084276a9f11 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,22 @@
+2010-05-14  Kenichi Handa  <handa@m17n.org>
+
+        * dispextern.h (struct composition_it): New member reversed_p.
+
+        * composite.c (composition_compute_stop_pos): Search backward if
+        ENDPOS < CHARPOS.
+        (composition_reseat_it): Handle the case that ENDPOS < CHARPOS.
+        Set CMP_IT->reversed_p.
+        (composition_update_it): Pay attention ot CMP_IT->reversed_p.
+
+        * xdisp.c (set_iterator_to_next): Call
+        composition_compute_stop_pos with negative ENDPOS if we are
+        scanning backward.  Call composition_compute_stop_pos if scan
+        direction is changed.
+        (next_element_from_buffer): Call composition_compute_stop_pos with
+        negative ENDPOS if we are scanning backward.
+        (next_element_from_composition): Pay attention to
+        IT->cmp_it.reversed_p.
+
 2010-05-10  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (LIBS_SYSTEM): Set using configure, not cpp.