--- rxvt-unicode/src/rxvtfont.C	2007/09/12 19:51:41	1.118
+++ rxvt-unicode/src/rxvtfont.C	2007/10/28 11:25:04	1.121
@@ -239,7 +239,22 @@
   else if (color >= 0)
     {
 #if XFT
-      XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
+      bool done = false;
+#ifdef HAVE_BG_PIXMAP
+      if (term->bgPixmap.pixmap && color >= 0 && term->pix_colors[color].c.color.alpha < 0x0ff00)
+        {
+          Picture dst = XftDrawPicture (d);
+          if (dst != 0)
+            {
+              XClearArea (disp, d, x, y, w, h, false);
+              Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
+              XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
+              done = true;
+            }
+        }
+#endif        
+      if (!done)
+        XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
 #else
       XSetForeground (disp, gc, term->pix_colors[color]);
       XFillRectangle (disp, d, gc, x, y, w, h);
@@ -499,7 +514,7 @@
   if (XGetFontProperty (f, property, &value))
     return XGetAtomName (term->dpy, value);
   else
-    return rxvt_strdup (repl);
+    return repl ? strdup (repl) : 0;
 }
 
 rxvt_fontprop
@@ -1045,7 +1060,7 @@
              const text_t *text, int len,
              int fg, int bg);
 
-  bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;
+  bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
 
 protected:
   XftFont *f;
@@ -1318,10 +1333,10 @@
 
   if (buffered)
     {
+      bool back_rendered = false;
       if (ep != enc)
         {
           rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
-          bool back_rendered = false;
 
 #ifdef HAVE_BG_PIXMAP
           if (term->bgPixmap.pixmap)