diff options
| author | Robert Pluim | 2021-10-27 18:46:45 +0200 |
|---|---|---|
| committer | Robert Pluim | 2021-10-27 18:56:33 +0200 |
| commit | e3171e7e860f77156873f13161a8833a210bae37 (patch) | |
| tree | 866f0dbb3a0e5f3b8f38105426a513ba64782a36 /src | |
| parent | 2bdd5732aaef336681476d83bb87d76f6750d34d (diff) | |
| download | emacs-e3171e7e860f77156873f13161a8833a210bae37.tar.gz emacs-e3171e7e860f77156873f13161a8833a210bae37.zip | |
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.
Diffstat (limited to 'src')
| -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) | |||
| 2415 | continue; | 2415 | continue; |
| 2416 | 2416 | ||
| 2417 | /* Don't use a color bitmap font unless its family is | 2417 | /* Don't use a color bitmap font unless its family is |
| 2418 | explicitly specified. */ | 2418 | explicitly specified or we're looking for a font for |
| 2419 | if ((sym_traits & kCTFontTraitColorGlyphs) && NILP (family)) | 2419 | emoji. */ |
| 2420 | if ((sym_traits & kCTFontTraitColorGlyphs) | ||
| 2421 | && NILP (family) | ||
| 2422 | && !EQ (CDR_SAFE (assq_no_quit (QCscript, AREF (spec, FONT_EXTRA_INDEX))), | ||
| 2423 | Qemoji)) | ||
| 2420 | continue; | 2424 | continue; |
| 2421 | 2425 | ||
| 2422 | if (j > 0 | 2426 | if (j > 0 |