--- rxvt-unicode/src/defaultfont.C	2004/03/22 15:15:04	1.49
+++ rxvt-unicode/src/defaultfont.C	2004/04/02 00:51:09	1.51
@@ -731,7 +731,6 @@
 
   XGCValues v;
   v.foreground = r->PixColors[fg];
-  v.background = r->PixColors[bg];
   v.font = f->fid;
 
   if (enc2b)
@@ -740,6 +739,7 @@
 
       if (bg == Color_bg && !slow)
         {
+          v.background = r->PixColors[bg];
           XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
           XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
         }
@@ -771,6 +771,7 @@
 
       if (bg == Color_bg && !slow)
         {
+          v.background = r->PixColors[bg];
           XChangeGC (d.display->display, TGC, GCForeground | GCBackground | GCFont, &v);
           XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
         }
@@ -999,7 +1000,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 rxvt_fontset::rxvt_fontset (rxvt_t r)
-: r (r)
+: r (r), fontdesc (0)
 {
   clear ();
 }
@@ -1015,6 +1016,8 @@
   for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
     FONT_UNREF (*i);
 
+  free (fontdesc); fontdesc = 0;
+
   fonts.clear ();
   base_id = 0;
   base_prop.height = 0x7fffffff;
@@ -1131,6 +1134,8 @@
 {
   clear ();
 
+  fontdesc = strdup (desc);
+
   fonts.push_back (new_font (0, CS_UNICODE));
   realize_font (0);