[Emacs-diffs] emacs-25 9344612: Disable multicolor fonts on OS X since they are not supported on free systems

[YAMAMOTO Mitsuharu]

branch: emacs-25
commit 9344612d3cd164317170b6189ec43175757e4231
Author: YAMAMOTO Mitsuharu <address@hidden>
Commit: YAMAMOTO Mitsuharu <address@hidden>

    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.
---
 src/macfont.m |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/macfont.m b/src/macfont.m
index c9082a5..0445628 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