1 files changed, 12 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 205ae565e6b..063d65475ef 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-22  Kenichi Handa  <handa@m17n.org>
+
+        * xdisp.c (compute_stop_pos): Call composition_compute_stop_pos
+        only if we are not at a composition.
+        (set_iterator_to_next): Give it->end_charpos to
+        composition_compute_stop_pos.
+        (set_iterator_to_next, next_element_from_buffer): Likewise.
+
+        * dispnew.c (buffer_posn_from_coords): Fix position when the
+        current display element is a grapheme cluster in bidi-reordered
+        region.
+
 2010-09-21  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * emacs.c: Do not include sys/ioctl.h, not needed.