Commit ad257d4f authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

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.
parent 52fab9c9
...@@ -3,6 +3,11 @@ ...@@ -3,6 +3,11 @@
* xdisp.c (get_it_property): If it->object is a buffer, pass to * xdisp.c (get_it_property): If it->object is a buffer, pass to
get-char-property the window that is being rendered, instead of get-char-property the window that is being rendered, instead of
the buffer, to support window-specific overlays. (Bug#14575) 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 <eliz@gnu.org> 2013-06-08 Eli Zaretskii <eliz@gnu.org>
   
......
...@@ -3509,9 +3509,8 @@ compute_display_string_pos (struct text_pos *position, ...@@ -3509,9 +3509,8 @@ compute_display_string_pos (struct text_pos *position,
   
if (string && STRINGP (string->lstring)) if (string && STRINGP (string->lstring))
object1 = object = string->lstring; object1 = object = string->lstring;
else if (!string_p) else if (w && !string_p)
{ {
eassert (w != NULL);
XSETWINDOW (object, w); XSETWINDOW (object, w);
object1 = Qnil; object1 = Qnil;
} }
...@@ -20013,7 +20012,10 @@ See also `bidi-paragraph-direction'. */) ...@@ -20013,7 +20012,10 @@ See also `bidi-paragraph-direction'. */)
itb.string.lstring = Qnil; itb.string.lstring = Qnil;
itb.string.bufpos = 0; itb.string.bufpos = 0;
itb.string.unibyte = 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_paragraph_init (NEUTRAL_DIR, &itb, 1);
bidi_unshelve_cache (itb_data, 0); bidi_unshelve_cache (itb_data, 0);
set_buffer_temp (old); set_buffer_temp (old);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment