diff options
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2019-04-27 14:43:19 +0900 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2019-04-27 14:43:19 +0900 |
| commit | 28220664714c50996d8318788289e1c69d69b8ab (patch) | |
| tree | 975c29024a5d8341001337c584064ad20549b6bc /src | |
| parent | dfa7f367a0b8987f21f36f6fdf81a45fea8b3d08 (diff) | |
| download | emacs-28220664714c50996d8318788289e1c69d69b8ab.tar.gz | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/macfont.m | 6 |
1 files changed, 3 insertions, 3 deletions
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 |