diff options
| author | Paul Eggert | 2016-11-06 00:33:43 -0700 |
|---|---|---|
| committer | Paul Eggert | 2016-11-06 00:42:03 -0700 |
| commit | dc152c54f4e44f5f2040883b03f71ff6aa66c893 (patch) | |
| tree | 7b4f0336a1f03e7a53d980000a42568b10907409 /src/macfont.m | |
| parent | 84c53436ab25b6c8f76c133e59b34e533ea33cc7 (diff) | |
| download | emacs-dc152c54f4e44f5f2040883b03f71ff6aa66c893.tar.gz emacs-dc152c54f4e44f5f2040883b03f71ff6aa66c893.zip | |
Modernize usage of 'macOS' in doc and comments
Apple changed the spelling of its operating system again, to "macOS",
effective with macOS 10.12 Sierra (2016-09-20). Change Emacs
documentation and comments to match this. Stick with older OS
spellings ("OS X", "Mac OS X") when talking about older releases where
the older names are more correct.
Diffstat (limited to 'src/macfont.m')
| -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 04456283fa1..ed7c1e3bd7a 100644 --- a/src/macfont.m +++ b/src/macfont.m | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* Font driver on Mac OSX Core text. | 1 | /* Font driver on macOS Core text. |
| 2 | Copyright (C) 2009-2016 Free Software Foundation, Inc. | 2 | Copyright (C) 2009-2016 Free Software Foundation, Inc. |
| 3 | 3 | ||
| 4 | This file is part of GNU Emacs. | 4 | This file is part of GNU Emacs. |
| @@ -1005,7 +1005,7 @@ macfont_set_family_cache (Lisp_Object symbol, CFStringRef string) | |||
| 1005 | and those start with ".". NULL means the cache has been invalidated. | 1005 | and those start with ".". NULL means the cache has been invalidated. |
| 1006 | Otherwise, the value is CFArray of CFStrings and the elements are | 1006 | Otherwise, the value is CFArray of CFStrings and the elements are |
| 1007 | sorted in the canonical order (CTFontManagerCompareFontFamilyNames on | 1007 | sorted in the canonical order (CTFontManagerCompareFontFamilyNames on |
| 1008 | OS X 10.6 and later). */ | 1008 | Mac OS X 10.6 and later). */ |
| 1009 | 1009 | ||
| 1010 | static CFArrayRef macfont_available_families_cache = NULL; | 1010 | static CFArrayRef macfont_available_families_cache = NULL; |
| 1011 | 1011 | ||
| @@ -4042,7 +4042,7 @@ mac_register_font_driver (struct frame *f) | |||
| 4042 | void | 4042 | void |
| 4043 | syms_of_macfont (void) | 4043 | syms_of_macfont (void) |
| 4044 | { | 4044 | { |
| 4045 | /* Core Text, for Mac OS X. */ | 4045 | /* Core Text, for macOS. */ |
| 4046 | DEFSYM (Qmac_ct, "mac-ct"); | 4046 | DEFSYM (Qmac_ct, "mac-ct"); |
| 4047 | macfont_driver.type = Qmac_ct; | 4047 | macfont_driver.type = Qmac_ct; |
| 4048 | register_font_driver (&macfont_driver, NULL); | 4048 | register_font_driver (&macfont_driver, NULL); |