--- rxvt-unicode/src/rxvtfont.C	2006/08/27 10:10:25	1.103
+++ rxvt-unicode/src/rxvtfont.C	2007/02/17 16:19:09	1.107
@@ -234,9 +234,9 @@
   dTermDisplay;
   dTermGC;
   
-  if (color < 0 || color == Color_bg)
+  if (color == Color_bg || color == Color_transparent)
     XClearArea (disp, d, x, y, w, h, false);
-  else
+  else if (color >= 0)
     {
 #if XFT
       XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
@@ -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
@@ -483,7 +483,6 @@
 
   bool slow; // wether this is a proportional font or has other funny characteristics
   XFontStruct *f;
-  codeset cs;
   bool enc2b, encm;
 
   char *get_property (XFontStruct *f, Atom property, const char *repl) const;
@@ -1277,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 TRANSPARENT
                   || !term->am_transparent        // we aren't transparent
-                  || term->am_pixmap_trans        // we have a pixmap
 # endif
 #endif
                   ;