diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2013-11-07 23:21:08 +0100 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2013-11-07 23:21:08 +0100 |
| commit | 5ee2921081ec21d18b1a190bdacb3ebd3bfdc294 (patch) | |
| tree | 9fbf407c98c2c8bdd9657e631c2a68cf59ae33f4 /src/macfont.h | |
| parent | 3220d5279d488e51afb3a49cda5c48fa9ca4e36c (diff) | |
| download | emacs-5ee2921081ec21d18b1a190bdacb3ebd3bfdc294.tar.gz | |
Import macfont changes from mac-port 4.5.
* macfont.h (kCTVersionNumber10_9): Define if not defined.
* macfont.m (mac_font_copy_default_descriptors_for_language)
(mac_font_copy_default_name_for_charset_and_languages): Declare.
(cf_charset_table): big-5-0 has uniquifier 0x4EDC.
(macfont_language_default_font_names): New.
(macfont_list): Rearrange language/charset code.
(macfont_close): Don't check for macfont_info->cache.
(mac_ctfont_create_preferred_family_for_attributes): New font
selection code, call
mac_font_copy_default_name_for_charset_and_languages.
(mac_font_copy_default_descriptors_for_language)
(mac_font_copy_default_name_for_charset_and_languages): New functions.
Diffstat (limited to 'src/macfont.h')
| -rw-r--r-- | src/macfont.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/macfont.h b/src/macfont.h index 141d60bfb0a..4b57c18692e 100644 --- a/src/macfont.h +++ b/src/macfont.h @@ -134,6 +134,9 @@ enum { #define mac_nsctfont_copy_font_descriptor CTFontCopyFontDescriptor +#ifndef kCTVersionNumber10_9 +#define kCTVersionNumber10_9 0x00060000 +#endif #define MAC_FONT_CHARACTER_SET_STRING_ATTRIBUTE \ (CFSTR ("MAC_FONT_CHARACTER_SET_STRING_ATTRIBUTE")) |