--- rxvt-unicode/src/rxvtfont.C	2006/01/31 00:25:16	1.93
+++ rxvt-unicode/src/rxvtfont.C	2006/02/02 18:04:46	1.94
@@ -160,7 +160,7 @@
 
 #define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
 
-#define dTermDisplay Display *disp = term->xdisp
+#define dTermDisplay Display *disp = term->dpy
 #define dTermGC      GC gc = term->gc
 
 /////////////////////////////////////////////////////////////////////////////
@@ -175,7 +175,7 @@
 rxvt_drawable::operator XftDraw *()
 {
   if (!xftdrawable)
-    xftdrawable = XftDrawCreate (screen->xdisp, drawable, screen->visual, screen->cmap);
+    xftdrawable = XftDrawCreate (screen->dpy, drawable, screen->visual, screen->cmap);
 
   return xftdrawable;
 }
@@ -516,7 +516,7 @@
   unsigned long value;
 
   if (XGetFontProperty (f, property, &value))
-    return XGetAtomName (term->xdisp, value);
+    return XGetAtomName (term->dpy, value);
   else
     return rxvt_strdup (repl);
 }
@@ -549,7 +549,7 @@
   unsigned long height;
 
 #if 0
-  if (!XGetFontProperty (f, XInternAtom (term->xdisp, "PIXEL_SIZE", 0), &height))
+  if (!XGetFontProperty (f, XInternAtom (term->dpy, "PIXEL_SIZE", 0), &height))
     return false;
 #else
   height = f->ascent + f->descent;
@@ -894,7 +894,7 @@
 {
   if (f)
     {
-      XFreeFont (term->xdisp, f);
+      XFreeFont (term->dpy, f);
       f = 0;
     }
 }
@@ -1076,7 +1076,7 @@
 {
   if (f)
     {
-      XftFontClose (term->xdisp, f);
+      XftFontClose (term->dpy, f);
       f = 0;
     }
 }
@@ -1253,7 +1253,7 @@
 {
   careful = false;
 
-  if (!XftCharExists (term->xdisp, f, unicode))
+  if (!XftCharExists (term->dpy, f, unicode))
     return false;
 
   if (!prop || prop->width == rxvt_fontprop::unset)
@@ -1262,7 +1262,7 @@
   // check character against base font bounding box
   FcChar32 ch = unicode;
   XGlyphInfo g;
-  XftTextExtents32 (term->xdisp, f, &ch, 1, &g);
+  XftTextExtents32 (term->dpy, f, &ch, 1, &g);
 
   int w = g.width - g.x;
   int wcw = max (WCWIDTH (unicode), 1);
@@ -1578,7 +1578,7 @@
               //FcPatternAddBool    (p, FC_ANTIALIAS, 1);
 
               XftResult result;
-              FcPattern *match = XftFontMatch (term->xdisp, term->display->screen, p, &result);
+              FcPattern *match = XftFontMatch (term->dpy, term->display->screen, p, &result);
 
               FcPatternDestroy (p);