aboutsummaryrefslogtreecommitdiffstats
path: root/src/nsfont.m
diff options
context:
space:
mode:
authorPaul Eggert2016-11-06 00:33:43 -0700
committerPaul Eggert2016-11-06 00:42:03 -0700
commitdc152c54f4e44f5f2040883b03f71ff6aa66c893 (patch)
tree7b4f0336a1f03e7a53d980000a42568b10907409 /src/nsfont.m
parent84c53436ab25b6c8f76c133e59b34e533ea33cc7 (diff)
downloademacs-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/nsfont.m')
-rw-r--r--src/nsfont.m4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nsfont.m b/src/nsfont.m
index 92e7d1154bf..4f95ee3a1a8 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -1,4 +1,4 @@
1/* Font back-end driver for the NeXT/Open/GNUstep and MacOSX window system. 1/* Font back-end driver for the NeXT/Open/GNUstep and macOS window system.
2 See font.h 2 See font.h
3 Copyright (C) 2006-2016 Free Software Foundation, Inc. 3 Copyright (C) 2006-2016 Free Software Foundation, Inc.
4 4
@@ -500,7 +500,7 @@ static NSSet
500 { 500 {
501 NSCharacterSet *fset = [[fontMgr fontWithFamily: family 501 NSCharacterSet *fset = [[fontMgr fontWithFamily: family
502 traits: 0 weight: 5 size: 12.0] coveredCharacterSet]; 502 traits: 0 weight: 5 size: 12.0] coveredCharacterSet];
503 /* Some fonts on OS X, maybe many on GNUstep, return nil. */ 503 /* Some fonts on macOS, maybe many on GNUstep, return nil. */
504 if (fset == nil) 504 if (fset == nil)
505 fset = [NSCharacterSet characterSetWithRange: 505 fset = [NSCharacterSet characterSetWithRange:
506 NSMakeRange (0, 127)]; 506 NSMakeRange (0, 127)];