From: Robert Pluim <rpluim@gmail.com>
Date: Wed, 27 Oct 2021 16:46:45 +0000 (+0200)
Subject: Allow automatic use of color fonts for emoji on macOS
X-Git-Tag: emacs-28.0.90~169
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e3171e7e860f77156873f13161a8833a210bae37;p=emacs.git

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 d86f09f4850..78ed5d53f39 100644
--- 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