Fix bug #14575 with window-specific overlays with display props.

 src/bidi.c (bidi_fetch_char): Accept additional argument, the window
 being displayed, and pass it to compute_display_string_pos.
 (bidi_level_of_next_char, bidi_resolve_explicit_1)
 (bidi_paragraph_init): All callers changed.
 src/xdisp.c (init_from_display_pos, init_iterator)
 (handle_single_display_spec, next_overlay_string)
 (get_overlay_strings_1, reseat_1, reseat_to_string)
 (push_prefix_prop, Fcurrent_bidi_paragraph_direction): Set
 bidi_it.w member from it->w.
 (compute_display_string_pos): Accept additional argument, the
 window being displayed, and pass it to Fget_char_property.
 src/dispextern.h (struct bidi_it): New member w, the window being
 displayed.
 (compute_display_string_pos): Adjust prototype.

1 files changed, 20 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 629f90678e6..cf5a8c0ee1e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,23 @@
+2013-06-08  Eli Zaretskii  <eliz@gnu.org>
+
+        * bidi.c (bidi_fetch_char): Accept additional argument, the window
+        being displayed, and pass it to compute_display_string_pos.
+        (bidi_level_of_next_char, bidi_resolve_explicit_1)
+        (bidi_paragraph_init): All callers changed.
+
+        * xdisp.c (init_from_display_pos, init_iterator)
+        (handle_single_display_spec, next_overlay_string)
+        (get_overlay_strings_1, reseat_1, reseat_to_string)
+        (push_prefix_prop, Fcurrent_bidi_paragraph_direction): Set
+        bidi_it.w member from it->w.
+        (compute_display_string_pos): Accept additional argument, the
+        window being displayed, and pass it to Fget_char_property.
+        (Bug#14575)
+
+        * dispextern.h (struct bidi_it): New member w, the window being
+        displayed.
+        (compute_display_string_pos): Adjust prototype.
+
 2013-06-08  Jan Djärv  <jan.h.d@swipnet.se>
 
         * xgselect.c: Remove unneeded include xterm.h