diff options
| -rw-r--r-- | src/macfont.m | 8 |
1 files changed, 6 insertions, 2 deletions
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 |