summaryrefslogtreecommitdiff
path: root/src/frame.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-11-06 00:33:43 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2016-11-06 00:42:03 -0700
commitdc152c54f4e44f5f2040883b03f71ff6aa66c893 (patch)
tree7b4f0336a1f03e7a53d980000a42568b10907409 /src/frame.c
parent84c53436ab25b6c8f76c133e59b34e533ea33cc7 (diff)
downloademacs-dc152c54f4e44f5f2040883b03f71ff6aa66c893.tar.gz
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/frame.c')
-rw-r--r--src/frame.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/frame.c b/src/frame.c
index cfa5f7d5027..854f72e64b4 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -5088,7 +5088,7 @@ Setting this variable does not affect existing frames, only new ones. */);
doc: /* Default position of vertical scroll bars on this window-system. */);
#ifdef HAVE_WINDOW_SYSTEM
#if defined (HAVE_NTGUI) || defined (NS_IMPL_COCOA) || (defined (USE_GTK) && defined (USE_TOOLKIT_SCROLL_BARS))
- /* MS-Windows, Mac OS X, and GTK have scroll bars on the right by
+ /* MS-Windows, macOS, and GTK have scroll bars on the right by
default. */
Vdefault_frame_scroll_bars = Qright;
#else