From c8b0fc1999006af5a4317b44068fac13d9592143 Mon Sep 17 00:00:00 2001
From: Joakim Verona <joakim@verona.se>
Date: Wed, 1 Aug 2012 13:23:31 +0200
Subject: [PATCH] WVAR (it->w, buffer)

---
 src/xdisp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/xdisp.c b/src/xdisp.c
index 4d66546112..11a9eb5df9 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -4975,7 +4975,7 @@ handle_single_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object,
           it->what = IT_XWIDGET;
           it->method = GET_FROM_XWIDGET;
           it->position = start_pos;
-	  it->object = NILP (object) ? it->w->buffer : object;
+	  it->object = NILP (object) ? WVAR (it->w, buffer) : object;
 	  *position = start_pos;
 
           it->xwidget = lookup_xwidget(value);
-- 
2.39.2