Commit 52fab9c9 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

Fix bug #14575 with window-specific overlays with line-prefix or wrap-prefix.

 src/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.
parent bf77e230
2013-06-09 Eli Zaretskii <eliz@gnu.org>
* 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)
2013-06-08 Eli Zaretskii <eliz@gnu.org> 2013-06-08 Eli Zaretskii <eliz@gnu.org>
   
* bidi.c (bidi_fetch_char): Accept additional argument, the window * bidi.c (bidi_fetch_char): Accept additional argument, the window
......
...@@ -18971,16 +18971,19 @@ push_prefix_prop (struct it *it, Lisp_Object prop) ...@@ -18971,16 +18971,19 @@ push_prefix_prop (struct it *it, Lisp_Object prop)
static Lisp_Object static Lisp_Object
get_it_property (struct it *it, Lisp_Object prop) get_it_property (struct it *it, Lisp_Object prop)
{ {
Lisp_Object position; Lisp_Object position, object = it->object;
   
if (STRINGP (it->object)) if (STRINGP (object))
position = make_number (IT_STRING_CHARPOS (*it)); position = make_number (IT_STRING_CHARPOS (*it));
else if (BUFFERP (it->object)) else if (BUFFERP (object))
{
position = make_number (IT_CHARPOS (*it)); position = make_number (IT_CHARPOS (*it));
XSETWINDOW (object, it->w);
}
else else
return Qnil; return Qnil;
   
return Fget_char_property (position, prop, it->object); return Fget_char_property (position, prop, object);
} }
   
/* See if there's a line- or wrap-prefix, and if so, push it on IT. */ /* See if there's a line- or wrap-prefix, and if so, push it on IT. */
......
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