Index: NSAttributedString.m
===================================================================
--- NSAttributedString.m	(revision 25384)
+++ NSAttributedString.m	(working copy)
@@ -990,7 +990,7 @@
 - (NSFont*)_substituteFontWithName: (NSString*)fontName font: (NSFont*)baseFont
 {
   // FIXME: Catch case were baseFont is nil
-  return [NSFont fontWithName: fontName matrix: [baseFont matrix]];
+  return [NSFont fontWithName: fontName size: [baseFont pointSize]];
 }
 
 - (NSFont*)_substituteFontFor: (unichar)uchar font: (NSFont*)baseFont fromList: (NSArray *)fonts
@@ -1061,13 +1061,6 @@
     {
       return subFont;
     }
-
-  subFont = [self _substituteFontFor: uchar font: baseFont fromList: 
-                      [[NSFontManager sharedFontManager] availableFonts]];
-  if (subFont != nil)
-    {
-      return subFont;
-    }
   
   return nil;
 }