--- rxvt-unicode/src/rxvtfont.C	2010/03/28 22:02:52	1.154
+++ rxvt-unicode/src/rxvtfont.C	2010/03/31 22:22:32	1.161
@@ -484,6 +484,56 @@
     }
 }
 
+struct rxvt_font_meta : rxvt_font {
+  struct rxvt_fontset *fs;
+
+  rxvt_font_meta (rxvt_fontset *fs)
+  : rxvt_font ()
+  {
+    this->fs = fs;
+  }
+
+  rxvt_fontprop properties ()
+  {
+    rxvt_fontprop p;
+
+    p.width = p.height = 1;
+    p.ascent = rxvt_fontprop::unset;
+    p.weight = rxvt_fontprop::medium;
+    p.slant = rxvt_fontprop::roman;
+
+    return p;
+  }
+
+  bool load (const rxvt_fontprop &prop, bool force_prop)
+  {
+    width = 1; height = 1;
+    ascent = 1; descent = 0;
+
+    set_name (strdup ("built-in meta font"));
+
+    return true;
+  }
+
+  bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
+  {
+    return false;
+  }
+
+  void draw (rxvt_drawable &d, int x, int y,
+             const text_t *text, int len,
+             int fg, int bg)
+  {
+    while (len--)
+      {
+        int fid = fs->find_font_idx (*text);
+        (*fs)[fid]->draw (d, x, y, text, 1, fg, bg);
+        ++text;
+        x += term->fwidth;
+      }
+  }
+};
+
 /////////////////////////////////////////////////////////////////////////////
 
 struct rxvt_font_x11 : rxvt_font {
@@ -501,7 +551,7 @@
              const text_t *text, int len,
              int fg, int bg);
 
-  bool slow; // wether this is a proportional font or has other funny characteristics
+  bool slow; // whether this is a proportional font or has other funny characteristics
   XFontStruct *f;
   bool enc2b, encm;
 
@@ -917,7 +967,7 @@
   if (ch == NOCHAR)
     return false;
 
-  /* check wether the character exists in _this_ font. horrible. */
+  /* check whether the character exists in _this_ font. horrible. */
   XCharStruct *xcs;
 
   if (encm)
@@ -957,7 +1007,7 @@
   if (!prop || prop->width == rxvt_fontprop::unset)
     return true;
 
-  // check wether character overlaps previous/next character
+  // check whether character overlaps previous/next character
   int w = xcs->rbearing - xcs->lbearing;
   int wcw = max (WCWIDTH (unicode), 1);
 
@@ -1588,7 +1638,7 @@
 }
 
 int
-rxvt_fontset::find_font (unicode_t unicode)
+rxvt_fontset::find_font_idx (unicode_t unicode)
 {
   if (unicode >= 1<<20)
     return 0;
@@ -1624,8 +1674,7 @@
       bool careful;
       if (f->has_char (unicode, &prop, careful))
         {
-          if (careful)
-            i |= 128;
+          i = (i << 1) | careful;
 
           goto found;
         }
@@ -1711,5 +1760,9 @@
   return i;
 }
 
-
+int
+rxvt_fontset::find_font (unicode_t unicode)
+{
+  return min<int> ((fontCount << 1) | 1, find_font_idx (unicode));
+}