1 files changed, 11 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 071bcb23a03..5dc1c62266d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2011-06-13  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (compute_display_string_pos)
+        (compute_display_string_end, reseat_to_string): Don't assume
+        it->bidi_it.string.s always points to string.lstring's data.
+
+        * bidi.c (bidi_fetch_char, bidi_paragraph_init)
+        (bidi_resolve_explicit_1, bidi_resolve_explicit)
+        (bidi_resolve_weak, bidi_level_of_next_char): Don't assume
+        string.s always points to string.lstring's data.
+
 2011-06-11  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (set_iterator_to_next): Advance string position