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 721ebb2deddba11d30ee5095f47a0f109de9ad64..cf6f4fea3e900d5f0ff28c8901eda3a169e92f0d 100644 (file)
--- 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.
+
 \f
 * 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.
+
 \f
 ----------------------------------------------------------------------
 This file is part of GNU Emacs.

diff --git a/src/macfont.m b/src/macfont.m
index 59627823fae4a0969b8329562438f2582c1c05e2..d8e86201f53d9fece76fc6fb06b65a44c18d25b1 100644 (file)
--- 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