aboutsummaryrefslogtreecommitdiffstats
path: root/src/nsimage.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/nsimage.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/nsimage.m')
-rw-r--r--src/nsimage.m4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nsimage.m b/src/nsimage.m
index 5b2534b9007..66aecd4289d 100644
--- a/src/nsimage.m
+++ b/src/nsimage.m
@@ -1,4 +1,4 @@
1/* Image support for the NeXT/Open/GNUstep and MacOSX window system. 1/* Image support for the NeXT/Open/GNUstep and macOS window system.
2 Copyright (C) 1989, 1992-1994, 2005-2006, 2008-2016 Free Software 2 Copyright (C) 1989, 1992-1994, 2005-2006, 2008-2016 Free Software
3 Foundation, Inc. 3 Foundation, Inc.
4 4
@@ -21,7 +21,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
21Originally by Carl Edman 21Originally by Carl Edman
22Updated by Christian Limpach (chris@nice.ch) 22Updated by Christian Limpach (chris@nice.ch)
23OpenStep/Rhapsody port by Scott Bender (sbender@harmony-ds.com) 23OpenStep/Rhapsody port by Scott Bender (sbender@harmony-ds.com)
24MacOSX/Aqua port by Christophe de Dinechin (descubes@earthlink.net) 24macOS/Aqua port by Christophe de Dinechin (descubes@earthlink.net)
25GNUstep port and post-20 update by Adrian Robert (arobert@cogsci.ucsd.edu) 25GNUstep port and post-20 update by Adrian Robert (arobert@cogsci.ucsd.edu)
26*/ 26*/
27 27