--- rxvt-unicode/src/defaultfont.C	2004/03/05 05:52:02	1.37
+++ rxvt-unicode/src/defaultfont.C	2004/03/11 20:26:49	1.39
@@ -270,6 +270,8 @@
     width = 1; height = 1;
     ascent = 1; descent = 0;
 
+    set_name ("built-in pseudofont");
+
     return true;
   }
 
@@ -313,7 +315,9 @@
 
   while (len--)
     {
+#if ENABLE_COMBINING
       compose_char *cc;
+#endif
       text_t t = *text++;
 
       // is it in our linedrawing table?
@@ -352,6 +356,7 @@
           gcv.line_width = 0;
           XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
         }
+#if ENABLE_COMBINING
       else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
         {
           rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
@@ -366,6 +371,7 @@
               f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
             }
         }
+#endif
       else
         switch (t)
           {