--- rxvt-unicode/src/defaultfont.C	2004/03/05 21:26:01	1.38
+++ rxvt-unicode/src/defaultfont.C	2004/03/15 01:27:46	1.41
@@ -63,7 +63,7 @@
   { CS_UNICODE,        "xft:Kochi Gothic:antialias=false"          },
 # endif
   { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0"  },
-  { CS_JIS0208_1983_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0"  },
+  { CS_JIS0208_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0"  },
   { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0"  },
 #endif
 
@@ -275,7 +275,7 @@
     return true;
   }
 
-  bool has_codepoint (uint32_t unicode)
+  bool has_codepoint (unicode_t unicode)
   {
     if (unicode <= 0x001f)
       return true;
@@ -315,7 +315,9 @@
 
   while (len--)
     {
+#if ENABLE_COMBINING
       compose_char *cc;
+#endif
       text_t t = *text++;
 
       // is it in our linedrawing table?
@@ -354,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)];
@@ -368,6 +371,7 @@
               f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
             }
         }
+#endif
       else
         switch (t)
           {
@@ -402,7 +406,7 @@
 
   bool load (const rxvt_fontprop &prop);
 
-  bool has_codepoint (uint32_t unicode);
+  bool has_codepoint (unicode_t unicode);
 
   void draw (rxvt_drawable &d, int x, int y,
              const text_t *text, int len,
@@ -659,7 +663,7 @@
 }
 
 bool
-rxvt_font_x11::has_codepoint (uint32_t unicode)
+rxvt_font_x11::has_codepoint (unicode_t unicode)
 {
   uint32_t ch = FROM_UNICODE (cs, unicode);
 
@@ -811,7 +815,7 @@
              const text_t *text, int len,
              int fg, int bg);
 
-  bool has_codepoint (uint32_t unicode);
+  bool has_codepoint (unicode_t unicode);
 
 protected:
   XftFont *f;
@@ -934,7 +938,7 @@
 }
 
 bool
-rxvt_font_xft::has_codepoint (uint32_t unicode)
+rxvt_font_xft::has_codepoint (unicode_t unicode)
 {
   return XftCharExists (DISPLAY, f, unicode);
 }
@@ -1147,7 +1151,7 @@
 }
 
 int
-rxvt_fontset::find_font (uint32_t unicode)
+rxvt_fontset::find_font (unicode_t unicode)
 {
   for (unsigned int i = 0; i < fonts.size (); i++)
     {