upstream

1 files changed, 11 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2b5b6fd0602..85a55b2b7c9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2011-08-19  Eli Zaretskii  <eliz@gnu.org>
+
+        * xfaces.c (face_at_buffer_position): Avoid repeated evaluation of
+        face ID by FACE_FROM_ID, and avoid a crash when mouse is moved
+        from an Org mode buffer to a Speedbar frame.
+
+        * xdisp.c (RECORD_MAX_MIN_POS): If the display element comes from
+        a composition, take its buffer position from IT->cmp_it.charpos.
+        Fixes cursor positioning at the beginning of a line that begins
+        with a composed character.
+
 2011-08-18  Eli Zaretskii  <eliz@gnu.org>
 
         * bidi.c (bidi_get_type): If bidi_type_table reports zero as the