--- rxvt-unicode/src/rxvtfont.C	2004/09/08 05:45:30	1.46
+++ rxvt-unicode/src/rxvtfont.C	2004/11/21 20:19:24	1.48
@@ -694,7 +694,7 @@
       char fname[1024];
 
       int diff = 0;
-      
+
       if (replace_field (fname, list[i], 6, '0', field_str))
         diff += 10; // slightly penalize scalable fonts
 
@@ -1058,7 +1058,7 @@
   FcValue v;
 
   if (prop.height != rxvt_fontprop::unset
-      && FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch)
+      || FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch)
     FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
 
   if (prop.weight != rxvt_fontprop::unset