Allow automatic use of color fonts for emoji on macOS

* src/macfont.m (macfont_list): Don't exclude color fonts when the
fontspec has an 'emoji' script specification.

diff --git a/src/macfont.m b/src/macfont.m
index d86f09f4850368666baeb3ddfa626b4230c7e293..78ed5d53f39b7a43a8055b996e2fcd7430e7c3d9 100644 (file)
--- a/src/macfont.m
+++ b/src/macfont.m
@@ -2415,8 +2415,12 @@ macfont_list (struct frame *f, Lisp_Object spec)
             continue;
 
           /* Don't use a color bitmap font unless its family is
-             explicitly specified.  */
-          if ((sym_traits & kCTFontTraitColorGlyphs) && NILP (family))
+             explicitly specified or we're looking for a font for
+             emoji.  */
+          if ((sym_traits & kCTFontTraitColorGlyphs)
+              && NILP (family)
+              && !EQ (CDR_SAFE (assq_no_quit (QCscript, AREF (spec, FONT_EXTRA_INDEX))),
+                      Qemoji))
             continue;
 
           if (j > 0