From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Sat, 27 Apr 2019 05:43:19 +0000 (+0900)
Subject: Update multicolor font support status
X-Git-Tag: emacs-27.0.90~3066
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=28220664714c50996d8318788289e1c69d69b8ab;p=emacs.git

Update multicolor font support status

* etc/NEWS: Mention multicolor font support on Cairo and NS.
* src/macfont.m (macfont_list): Re-enable color bitmap fonts.
---

diff --git a/etc/NEWS b/etc/NEWS
index 721ebb2dedd..cf6f4fea3e9 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -337,6 +337,9 @@ longer.
    directories searched for byte-compiler error messages (this used to
    be controlled by compilation-search-path).
 
+** Multicolor fonts such as "Noto Color Emoji" can be displayed on
+Emacs configured with Cairo drawing and linked with cairo >= 1.16.0.
+
 
 * Editing Changes in Emacs 27.1
 
@@ -1977,6 +1980,9 @@ modifier keys in line with Apples guidelines.  This makes the drag and
 drop behaviour more consistent, as previously the sending application
 was able to 'set' modifiers without the knowledge of the user.
 
+** On NS multicolor font display is enabled again since it is also
+implemented in Emacs on free operating systems via Cairo drawing.
+
 
 ----------------------------------------------------------------------
 This file is part of GNU Emacs.
diff --git a/src/macfont.m b/src/macfont.m
index 59627823fae..d8e86201f53 100644
--- a/src/macfont.m
+++ b/src/macfont.m
@@ -2344,9 +2344,9 @@ macfont_list (struct frame *f, Lisp_Object spec)
                   != (spacing >= FONT_SPACING_MONO)))
             continue;
 
-          /* Don't use a color bitmap font until it is supported on
-	     free platforms.  */
-          if (sym_traits & kCTFontTraitColorGlyphs)
+          /* Don't use a color bitmap font unless its family is
+             explicitly specified.  */
+          if ((sym_traits & kCTFontTraitColorGlyphs) && NILP (family))
             continue;
 
           if (j > 0