--- rxvt-unicode/src/rxvtfont.C	2006/10/03 12:50:31	1.105
+++ rxvt-unicode/src/rxvtfont.C	2007/06/26 00:40:19	1.108
@@ -234,7 +234,7 @@
   dTermDisplay;
   dTermGC;
   
-  if (color == Color_bg)
+  if (color == Color_bg || color == Color_transparent)
     XClearArea (disp, d, x, y, w, h, false);
   else if (color >= 0)
     {
@@ -443,7 +443,7 @@
                                 ? f1
                                 : (*fs)[fs->find_font (cc->c2)];
 
-              f2->draw (d, x, y, chrs, width, fg, -1);
+              f2->draw (d, x, y, chrs, width, fg, Color_none);
             }
         }
 #endif
@@ -1276,9 +1276,8 @@
 
   bool buffered = bg >= 0                         // we don't use a transparent bg
 #ifndef FORCE_UNBUFFERED_XFT
-# if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
+# ifdef ENABLE_TRANSPARENCY
                   || !term->am_transparent        // we aren't transparent
-                  || term->am_pixmap_trans        // we have a pixmap
 # endif
 #endif
                   ;
@@ -1324,7 +1323,7 @@
 
           if (0)
             ;
-#ifdef TRANSPARENT
+#ifdef ENABLE_TRANSPARENCY
           else if (bg < 0 && term->am_pixmap_trans)
             XCopyArea (disp, term->pixmap, d2, gc,
                        x + term->window_vt_x, y + term->window_vt_y,