[Emacs-diffs] trunk r112902: Fix current-bidi-paragraph-direction wrt window pointer.

[Eli Zaretskii]

------------------------------------------------------------
revno: 112902
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sun 2013-06-09 19:49:07 +0300
message:
  Fix current-bidi-paragraph-direction wrt window pointer.
  
   src/xdisp.c (compute_display_string_pos): When W is NULL, use the current
   buffer as the object to pass to get-char-property.
   (Fcurrent_bidi_paragraph_direction): Assign NULL to the window
   pointer member of the bidi iterator, since no window is pertinent
   to this function.

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-06-09 16:37:22 +0000
+++ b/src/ChangeLog     2013-06-09 16:49:07 +0000
@@ -3,6 +3,11 @@
        * xdisp.c (get_it_property): If it->object is a buffer, pass to
        get-char-property the window that is being rendered, instead of
        the buffer, to support window-specific overlays.  (Bug#14575)
+       (compute_display_string_pos): When W is NULL, use the current
+       buffer as the object to pass to get-char-property.
+       (Fcurrent_bidi_paragraph_direction): Assign NULL to the window
+       pointer member of the bidi iterator, since no window is pertinent
+       to this function.
 
 2013-06-08  Eli Zaretskii  <address@hidden>
 

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2013-06-09 16:37:22 +0000
+++ b/src/xdisp.c       2013-06-09 16:49:07 +0000
@@ -3509,9 +3509,8 @@
 
   if (string && STRINGP (string->lstring))
     object1 = object = string->lstring;
-  else if (!string_p)
+  else if (w && !string_p)
     {
-      eassert (w != NULL);
       XSETWINDOW (object, w);
       object1 = Qnil;
     }
@@ -20013,7 +20012,10 @@
       itb.string.lstring = Qnil;
       itb.string.bufpos = 0;
       itb.string.unibyte = 0;
-      itb.w = XWINDOW (selected_window);
+      /* We have no window to use here for ignoring window-specific
+        overlays.  Using NULL for window pointer will cause
+        compute_display_string_pos to use the current buffer.  */
+      itb.w = NULL;
       bidi_paragraph_init (NEUTRAL_DIR, &itb, 1);
       bidi_unshelve_cache (itb_data, 0);
       set_buffer_temp (old);