--- rxvt-unicode/src/rxvtfont.C	2010/03/31 22:46:40	1.162
+++ rxvt-unicode/src/rxvtfont.C	2010/04/01 08:55:09	1.164
@@ -450,7 +450,7 @@
           chrs [1] = NOCHAR;
 
           *chrs = cc->c1;
-          rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
+          rxvt_font *f1 = (*fs)[fs->find_font_idx (cc->c1)];
           f1->draw (d, x, y, chrs, width, fg, bg);
 
           if (cc->c2 != NOCHAR)
@@ -461,7 +461,7 @@
               *chrs = cc->c2;
               rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
                                 ? f1
-                                : (*fs)[fs->find_font (cc->c2)];
+                                : (*fs)[fs->find_font_idx (cc->c2)];
 
               f2->draw (d, x, y, chrs, width, fg, Color_none);
             }
@@ -1541,6 +1541,9 @@
 void
 rxvt_fontset::push_font (rxvt_font *font)
 {
+  // the fontCount index is reserved for the overflow font, it is only
+  // necessary when we get fontCount or more fonts, as they cannot be
+  // represented in the rendition.
   if (fonts.size () == fontCount)
     {
       rxvt_font *f = new rxvt_font_overflow (this);