From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Mon, 11 Apr 2016 23:26:51 +0000 (+0900)
Subject: Disable multicolor fonts on OS X since they are not supported on free systems
X-Git-Tag: emacs-25.0.93~39
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9344612d3cd164317170b6189ec43175757e4231;p=emacs.git

Disable multicolor fonts on OS X since they are not supported on free systems

* src/macfont.m (macfont_list): Don't use color bitmap fonts.
---

diff --git a/src/macfont.m b/src/macfont.m
index c9082a58415..04456283fa1 100644
--- a/src/macfont.m
+++ b/src/macfont.m
@@ -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