summaryrefslogtreecommitdiff
path: root/src/xdisp.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/xdisp.c')
-rw-r--r--src/xdisp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index 5e549c9c63f..e74411c8178 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5361,9 +5361,6 @@ handle_display_prop (struct it *it)
if (!it->string_from_display_prop_p)
it->area = TEXT_AREA;
- if (!STRINGP (it->string))
- object = it->w->contents;
-
propval = get_char_property_and_overlay (make_fixnum (position->charpos),
Qdisplay, object, &overlay);
@@ -5377,6 +5374,9 @@ handle_display_prop (struct it *it)
/* Now OVERLAY is the overlay that gave us this property, or nil
if it was a text property. */
+ if (!STRINGP (it->string))
+ object = it->w->contents;
+
display_replaced = handle_display_spec (it, propval, object, overlay,
position, bufpos,
FRAME_WINDOW_P (it->f));