]> code.delx.au - gnu-emacs/commitdiff
Disable multicolor fonts on OS X since they are not supported on free systems
authorYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Mon, 11 Apr 2016 23:26:51 +0000 (08:26 +0900)
committerYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Mon, 11 Apr 2016 23:27:24 +0000 (08:27 +0900)
* src/macfont.m (macfont_list): Don't use color bitmap fonts.

src/macfont.m

index c9082a58415cb58392c7029fdc8b301eebb0b95f..04456283fa1877696107c9a9691fb86efe26d574 100644 (file)
@@ -2373,9 +2373,9 @@ macfont_list (struct frame *f, Lisp_Object spec)
                   != (spacing >= FONT_SPACING_MONO)))
             continue;
 
-          /* Don't use a color bitmap font unless its family is
-             explicitly specified.  */
-          if ((sym_traits & kCTFontTraitColorGlyphs) && NILP (family))
+          /* Don't use a color bitmap font until it is supported on
+            free platforms.  */
+          if (sym_traits & kCTFontTraitColorGlyphs)
             continue;
 
           if (j > 0