From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: p.stephani2@gmail.com Newsgroups: gmane.emacs.devel Subject: [PATCH] Use "macOS" in a couple more places Date: Sun, 20 Nov 2016 14:13:52 +0100 Message-ID: <20161120131352.44594-1-p.stephani2@gmail.com> References: NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1479647669 28730 195.159.176.226 (20 Nov 2016 13:14:29 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 20 Nov 2016 13:14:29 +0000 (UTC) Cc: Philipp Stephani To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 20 14:14:24 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c8Rwt-0006EL-MG for ged-emacs-devel@m.gmane.org; Sun, 20 Nov 2016 14:14:23 +0100 Original-Received: from localhost ([::1]:44949 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c8Rwx-0002tE-3x for ged-emacs-devel@m.gmane.org; Sun, 20 Nov 2016 08:14:27 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47989) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c8Rwp-0002t6-Qj for emacs-devel@gnu.org; Sun, 20 Nov 2016 08:14:22 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c8Rwm-0005Wd-Jy for emacs-devel@gnu.org; Sun, 20 Nov 2016 08:14:19 -0500 Original-Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:36698) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1c8Rwm-0005Va-7I for emacs-devel@gnu.org; Sun, 20 Nov 2016 08:14:16 -0500 Original-Received: by mail-wm0-x241.google.com with SMTP id m203so19149659wma.3 for ; Sun, 20 Nov 2016 05:14:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RiQbem2XjnUiVpvLrwpUrLYWz0t1P9lzK0Selehe1hc=; b=KKBonFNlo/l8Fq1KAs4Fyn2rK9VcsJvBAYlj5lcwRcIg8s/VcWg5JAqjaueN1hmV/G BuBvZ25fmZtF9xNt85SGsDZXbHoxhdVGvCYuFFMZnPzB7FYvcm+ZOJ8IiRh7Q3RosTw3 MdiCGmB4Vl8qy4cuqIpIlzDRgWdIPmm2mq0wkLQiwSfXylh7xdhM1pGKB91a7IrCgwIh Recy56YU3kJjRsub1eTgkHmj5H7s+0veSExM27CApvHCT8ihZ2jpnA0VJ+x77EV3WU2u VKxDU+zxI8SBuOGSKduiyMlXWgNjWQ8w5b8Ioo4MdLXcO9CIKjNu71iTsZWCVsKBmO2v 7sog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RiQbem2XjnUiVpvLrwpUrLYWz0t1P9lzK0Selehe1hc=; b=YSMnPUZukcsQIUqc4aCRtZuZM+bHtc5MCyw13xsOEtxYiRBhhoySVvPzZL/o9ci70+ AFzMYQX0Ad52dCO+/wieANSY/GsCwRJ4dve9W0qICsCLTEqshg6wzyT09BQtrk4jITyX N3wS/L2eSYb9wjF9CQ0uB2yWJr2QWsJTTX2hvLU39ziD5OGpXIrP6o9xMQxdzMiQWjLa HWYYDD2RFdwCfAeeNfgf7omaA9iUxIoHRIf3Xz+cnROEBsvSrSgjt6jCYFLI1UBzo41g +J5t+2brzvUf1lAh8AioT45S52KGqX98JNVAvlBXUVBL4SGFqnzfjLurO2tlWopdN+YN 3t7Q== X-Gm-Message-State: AKaTC02vxPulMBifpdI51fLcGzB569dKKsMwWwaWyuXnLosv5O/z0wuMxbIeXR8piwLfOg== X-Received: by 10.28.18.194 with SMTP id 185mr7658768wms.124.1479647654511; Sun, 20 Nov 2016 05:14:14 -0800 (PST) Original-Received: from p.cm.cablesurf.de (46.128.198.151.dynamic.cablesurf.de. [46.128.198.151]) by smtp.gmail.com with ESMTPSA id d64sm13894564wmh.3.2016.11.20.05.14.13 (version=TLS1 cipher=AES128-SHA bits=128/128); Sun, 20 Nov 2016 05:14:13 -0800 (PST) X-Mailer: git-send-email 2.10.2 In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::241 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:209506 Archived-At: From: Philipp Stephani --- doc/emacs/macos.texi | 4 +++- doc/lispref/files.texi | 6 +++--- doc/misc/efaq.texi | 8 +++++--- doc/misc/idlwave.texi | 6 ++++-- etc/PROBLEMS | 6 +++--- lib/acl-internal.c | 4 ++-- lib/acl-internal.h | 8 ++++---- lib/acl_entries.c | 6 +++--- lib/euidaccess.c | 2 +- lib/filemode.h | 2 +- lib/get-permissions.c | 6 +++--- lib/secure_getenv.c | 2 +- lib/set-permissions.c | 6 +++--- lib/signal.in.h | 10 +++++----- lib/string.in.h | 2 +- lib/sys_select.in.h | 2 +- lisp/faces.el | 2 +- m4/acl.m4 | 4 ++-- m4/getloadavg.m4 | 2 +- m4/gnulib-common.m4 | 2 +- m4/largefile.m4 | 2 +- m4/mktime.m4 | 2 +- m4/nocrash.m4 | 2 +- msdos/autogen/config.in | 8 ++++---- src/fileio.c | 14 +++++++------- src/nsterm.m | 2 +- 26 files changed, 63 insertions(+), 57 deletions(-) diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi index 6e6520b..b55fcca 100644 --- a/doc/emacs/macos.texi +++ b/doc/emacs/macos.texi @@ -2,8 +2,10 @@ @c Copyright (C) 2000-2016 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Mac OS / GNUstep -@appendix Emacs and Mac OS / GNUstep +@appendix Emacs and macOS / GNUstep @cindex macOS +@cindex OS X +@cindex Mac OS X @cindex Macintosh @cindex GNUstep diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index e189da9..ad506e3 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi @@ -1145,14 +1145,14 @@ Truenames which case it's important to know whether the underlying filesystem is case-insensitive. This function returns @code{t} if file @var{filename} is on a case-insensitive filesystem. It always returns -@code{t} on MS-DOS and MS-Windows. On Cygwin and Mac OS X, +@code{t} on MS-DOS and MS-Windows. On Cygwin and macOS, filesystems may or may not be case-insensitive, and the function tries to determine case-sensitivity by a runtime test. If the test is inconclusive, the function returns @code{t} on Cygwin and @code{nil} -on Mac OS X. +on macOS. Currently this function always returns @code{nil} on platforms other -than MS-DOS, MS-Windows, Cygwin, and Mac OS X. It does not detect +than MS-DOS, MS-Windows, Cygwin, and macOS. It does not detect case-insensitivity of mounted filesystems, such as Samba shares or NFS-mounted Windows volumes. On remote hosts, it assumes @code{t} for the @samp{smb} method. For all other connection methods, runtime diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi index 9efe0e7..f76adec 100644 --- a/doc/misc/efaq.texi +++ b/doc/misc/efaq.texi @@ -1210,7 +1210,7 @@ New in Emacs 23 @item There is a new NeXTstep port of Emacs. This supports GNUstep and Mac OS X (via the Cocoa libraries). The Carbon port of Emacs, which supported -Mac OS X in Emacs 22, has been removed. +macOS in Emacs 22, has been removed. @cindex Directory-local variables @item @@ -1245,11 +1245,11 @@ New in Emacs 22 @cindex Supported systems @item Emacs 22 features support for GNU/Linux systems on S390 and x86-64 -machines, as well as support for the Mac OS X and Cygwin operating +machines, as well as support for the macOS and Cygwin operating systems. @item -The native MS-Windows, and Mac OS X builds include full support +The native MS-Windows, and macOS builds include full support for images, toolbar, and tooltips. @item @@ -3566,6 +3566,8 @@ Emacs for macOS @cindex Apple computers, Emacs for @cindex Macintosh, Emacs for @cindex macOS, Emacs for +@cindex OS X, Emacs for +@cindex Mac OS X, Emacs for Beginning with version 22.1, Emacs supports macOS natively. See the file @file{nextstep/INSTALL} in the distribution. diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi index 32b3364..27a4895 100644 --- a/doc/misc/idlwave.texi +++ b/doc/misc/idlwave.texi @@ -3533,12 +3533,12 @@ Catalogs @end defopt @defopt idlwave-library-path -IDL library path for Windows and macOS@. Under Unix/macOS, will be +IDL library path for Windows. Under Unix/macOS, will be obtained from the Shell when run. @end defopt @defopt idlwave-system-directory -The IDL system directory for Windows and macOS@. Also needed for +The IDL system directory for Windows. Also needed for locating HTML help and the IDL Assistant for IDL v6.2 and later. Under Unix/macOS, will be obtained from the Shell and recorded, if run. @end defopt @@ -4023,6 +4023,8 @@ Windows and macOS @appendix Windows and macOS @cindex Windows @cindex macOS +@cindex OS X +@cindex Mac OS X IDLWAVE was developed on a UNIX system. However, thanks to the portability of Emacs, much of IDLWAVE does also work under different diff --git a/etc/PROBLEMS b/etc/PROBLEMS index c9b11fbc5..7cb4e45 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -2416,11 +2416,11 @@ please call support for your X-server and see if you can get a fix. If you do, please send it to bug-gnu-emacs@gnu.org so we can list it here. -* Runtime problems specific to Mac OS X +* Runtime problems specific to macOS -** On Mac OS X, file-name-case-insensitive-p may be unreliable +** On macOS, file-name-case-insensitive-p may be unreliable -The implementation of that function on Mac OS X uses pathconf with the +The implementation of that function on macOS uses pathconf with the _PC_CASE_SENSITIVE flag. There have been reports that this use of pathconf does not work reliably. If you have a problem, please recompile Emacs with -D DARWIN_OS_CASE_SENSITIVE_FIXME=1 or diff --git a/lib/acl-internal.c b/lib/acl-internal.c index 4de60c3..9b8104c 100644 --- a/lib/acl-internal.c +++ b/lib/acl-internal.c @@ -25,7 +25,7 @@ #if USE_ACL && HAVE_ACL_GET_FILE -# if HAVE_ACL_TYPE_EXTENDED /* Mac OS X */ +# if HAVE_ACL_TYPE_EXTENDED /* macOS */ /* ACL is an ACL, from a file, stored as type ACL_TYPE_EXTENDED. Return 1 if the given ACL is non-trivial. @@ -479,7 +479,7 @@ void free_permission_context (struct permission_context *ctx) { #if USE_ACL -# if HAVE_ACL_GET_FILE /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */ +# if HAVE_ACL_GET_FILE /* Linux, FreeBSD, macOS, IRIX, Tru64 */ if (ctx->acl) acl_free (ctx->acl); # if !HAVE_ACL_TYPE_EXTENDED diff --git a/lib/acl-internal.h b/lib/acl-internal.h index 636273e..f4cb010 100644 --- a/lib/acl-internal.h +++ b/lib/acl-internal.h @@ -72,7 +72,7 @@ _GL_INLINE_HEADER_BEGIN # if HAVE_ACL_GET_FILE /* POSIX 1003.1e (draft 17 -- abandoned) specific version. */ -/* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */ +/* Linux, FreeBSD, macOS, IRIX, Tru64 */ # ifndef MIN_ACL_ENTRIES # define MIN_ACL_ENTRIES 4 @@ -132,7 +132,7 @@ rpl_acl_set_fd (int fd, acl_t acl) # endif /* Set to 0 if a file's mode is stored independently from the ACL. */ -# if (HAVE_ACL_COPY_EXT_NATIVE && HAVE_ACL_CREATE_ENTRY_NP) || defined __sgi /* Mac OS X, IRIX */ +# if (HAVE_ACL_COPY_EXT_NATIVE && HAVE_ACL_CREATE_ENTRY_NP) || defined __sgi /* macOS, IRIX */ # define MODE_INSIDE_ACL 0 # endif @@ -144,7 +144,7 @@ rpl_acl_set_fd (int fd, acl_t acl) extern int acl_entries (acl_t); # endif -# if HAVE_ACL_TYPE_EXTENDED /* Mac OS X */ +# if HAVE_ACL_TYPE_EXTENDED /* macOS */ /* ACL is an ACL, from a file, stored as type ACL_TYPE_EXTENDED. Return 1 if the given ACL is non-trivial. Return 0 if it is trivial. */ @@ -256,7 +256,7 @@ extern int acl_nontrivial (int count, struct acl *entries); struct permission_context { mode_t mode; #if USE_ACL -# if HAVE_ACL_GET_FILE /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */ +# if HAVE_ACL_GET_FILE /* Linux, FreeBSD, macOS, IRIX, Tru64 */ acl_t acl; # if !HAVE_ACL_TYPE_EXTENDED acl_t default_acl; diff --git a/lib/acl_entries.c b/lib/acl_entries.c index 9fc9cf5..b6644a7 100644 --- a/lib/acl_entries.c +++ b/lib/acl_entries.c @@ -22,7 +22,7 @@ #include "acl-internal.h" /* This file assumes POSIX-draft like ACLs - (Linux, FreeBSD, Mac OS X, IRIX, Tru64). */ + (Linux, FreeBSD, macOS, IRIX, Tru64). */ /* Return the number of entries in ACL. Return -1 and set errno upon failure to determine it. */ @@ -34,8 +34,8 @@ acl_entries (acl_t acl) if (acl != NULL) { -#if HAVE_ACL_FIRST_ENTRY /* Linux, FreeBSD, Mac OS X */ -# if HAVE_ACL_TYPE_EXTENDED /* Mac OS X */ +#if HAVE_ACL_FIRST_ENTRY /* Linux, FreeBSD, macOS */ +# if HAVE_ACL_TYPE_EXTENDED /* macOS */ /* acl_get_entry returns 0 when it successfully fetches an entry, and -1/EINVAL at the end. */ acl_entry_t ace; diff --git a/lib/euidaccess.c b/lib/euidaccess.c index e9eb0e9..fcc0b38 100644 --- a/lib/euidaccess.c +++ b/lib/euidaccess.c @@ -84,7 +84,7 @@ euidaccess (const char *file, int mode) return accessx (file, mode, ACC_SELF); #elif HAVE_EACCESS /* FreeBSD */ return eaccess (file, mode); -#else /* Mac OS X, NetBSD, OpenBSD, HP-UX, Solaris, Cygwin, mingw, BeOS */ +#else /* macOS, NetBSD, OpenBSD, HP-UX, Solaris, Cygwin, mingw, BeOS */ uid_t uid = getuid (); gid_t gid = getgid (); diff --git a/lib/filemode.h b/lib/filemode.h index 09f345e..ed4aadf 100644 --- a/lib/filemode.h +++ b/lib/filemode.h @@ -23,7 +23,7 @@ /* Get the declaration of strmode. */ # if HAVE_DECL_STRMODE -# include /* Mac OS X, FreeBSD, OpenBSD */ +# include /* macOS, FreeBSD, OpenBSD */ # include /* NetBSD */ # endif diff --git a/lib/get-permissions.c b/lib/get-permissions.c index bf40dad..2aca895 100644 --- a/lib/get-permissions.c +++ b/lib/get-permissions.c @@ -38,7 +38,7 @@ get_permissions (const char *name, int desc, mode_t mode, #if USE_ACL && HAVE_ACL_GET_FILE /* POSIX 1003.1e (draft 17 -- abandoned) specific version. */ - /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */ + /* Linux, FreeBSD, macOS, IRIX, Tru64 */ # if !HAVE_ACL_TYPE_EXTENDED /* Linux, FreeBSD, IRIX, Tru64 */ @@ -67,9 +67,9 @@ get_permissions (const char *name, int desc, mode_t mode, # endif # else /* HAVE_ACL_TYPE_EXTENDED */ - /* Mac OS X */ + /* macOS */ - /* On Mac OS X, acl_get_file (name, ACL_TYPE_ACCESS) + /* On macOS, acl_get_file (name, ACL_TYPE_ACCESS) and acl_get_file (name, ACL_TYPE_DEFAULT) always return NULL / EINVAL. You have to use acl_get_file (name, ACL_TYPE_EXTENDED) diff --git a/lib/secure_getenv.c b/lib/secure_getenv.c index 88a60dc..417d772 100644 --- a/lib/secure_getenv.c +++ b/lib/secure_getenv.c @@ -30,7 +30,7 @@ secure_getenv (char const *name) { #if HAVE___SECURE_GETENV /* glibc */ return __secure_getenv (name); -#elif HAVE_ISSETUGID /* OS X, FreeBSD, NetBSD, OpenBSD */ +#elif HAVE_ISSETUGID /* macOS, FreeBSD, NetBSD, OpenBSD */ if (issetugid ()) return NULL; return getenv (name); diff --git a/lib/set-permissions.c b/lib/set-permissions.c index 2c77356..7620960 100644 --- a/lib/set-permissions.c +++ b/lib/set-permissions.c @@ -489,7 +489,7 @@ set_acls (struct permission_context *ctx, const char *name, int desc, # if HAVE_ACL_GET_FILE /* POSIX 1003.1e (draft 17 -- abandoned) specific version. */ - /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */ + /* Linux, FreeBSD, macOS, IRIX, Tru64 */ # if !HAVE_ACL_TYPE_EXTENDED /* Linux, FreeBSD, IRIX, Tru64 */ @@ -552,9 +552,9 @@ set_acls (struct permission_context *ctx, const char *name, int desc, # endif # else /* HAVE_ACL_TYPE_EXTENDED */ - /* Mac OS X */ + /* macOS */ - /* On Mac OS X, acl_get_file (name, ACL_TYPE_ACCESS) + /* On macOS, acl_get_file (name, ACL_TYPE_ACCESS) and acl_get_file (name, ACL_TYPE_DEFAULT) always return NULL / EINVAL. You have to use acl_get_file (name, ACL_TYPE_EXTENDED) diff --git a/lib/signal.in.h b/lib/signal.in.h index ab0a049..2f1fcba 100644 --- a/lib/signal.in.h +++ b/lib/signal.in.h @@ -213,7 +213,7 @@ typedef int verify_NSIG_constraint[NSIG <= 32 ? 1 : -1]; /* Test whether a given signal is contained in a signal set. */ # if @HAVE_POSIX_SIGNALBLOCKING@ -/* This function is defined as a macro on Mac OS X. */ +/* This function is defined as a macro on macOS. */ # if defined __cplusplus && defined GNULIB_NAMESPACE # undef sigismember # endif @@ -226,7 +226,7 @@ _GL_CXXALIASWARN (sigismember); /* Initialize a signal set to the empty set. */ # if @HAVE_POSIX_SIGNALBLOCKING@ -/* This function is defined as a macro on Mac OS X. */ +/* This function is defined as a macro on macOS. */ # if defined __cplusplus && defined GNULIB_NAMESPACE # undef sigemptyset # endif @@ -238,7 +238,7 @@ _GL_CXXALIASWARN (sigemptyset); /* Add a signal to a signal set. */ # if @HAVE_POSIX_SIGNALBLOCKING@ -/* This function is defined as a macro on Mac OS X. */ +/* This function is defined as a macro on macOS. */ # if defined __cplusplus && defined GNULIB_NAMESPACE # undef sigaddset # endif @@ -251,7 +251,7 @@ _GL_CXXALIASWARN (sigaddset); /* Remove a signal from a signal set. */ # if @HAVE_POSIX_SIGNALBLOCKING@ -/* This function is defined as a macro on Mac OS X. */ +/* This function is defined as a macro on macOS. */ # if defined __cplusplus && defined GNULIB_NAMESPACE # undef sigdelset # endif @@ -264,7 +264,7 @@ _GL_CXXALIASWARN (sigdelset); /* Fill a signal set with all possible signals. */ # if @HAVE_POSIX_SIGNALBLOCKING@ -/* This function is defined as a macro on Mac OS X. */ +/* This function is defined as a macro on macOS. */ # if defined __cplusplus && defined GNULIB_NAMESPACE # undef sigfillset # endif diff --git a/lib/string.in.h b/lib/string.in.h index b3213c4..57e7387 100644 --- a/lib/string.in.h +++ b/lib/string.in.h @@ -22,7 +22,7 @@ #if defined _GL_ALREADY_INCLUDING_STRING_H /* Special invocation convention: - - On OS X/NetBSD we have a sequence of nested includes + - On macOS/NetBSD we have a sequence of nested includes -> -> "string.h" In this situation system _chk variants due to -D_FORTIFY_SOURCE might be used after any replacements defined here. */ diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h index 9a2622f..10bef18 100644 --- a/lib/sys_select.in.h +++ b/lib/sys_select.in.h @@ -79,7 +79,7 @@ /* On OSF/1 4.0, provides only a forward declaration of 'struct timeval', and no definition of this type. - Also, Mac OS X, AIX, HP-UX, IRIX, Solaris, Interix declare select() + Also, macOS, AIX, HP-UX, IRIX, Solaris, Interix declare select() in . But avoid namespace pollution on glibc systems and "unknown type name" problems on Cygwin. */ diff --git a/lisp/faces.el b/lisp/faces.el index f536015..ed220b9 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -106,7 +106,7 @@ face-font-family-alternatives ;; This looks good on GNU/Linux. "Courier 10 Pitch" - ;; This looks good on MS-Windows and OS X. + ;; This looks good on MS-Windows and macOS. "Consolas" ;; This looks good on macOS. "Courier" looks good too, but is ;; jagged on GNU/Linux and so is listed later as "courier". diff --git a/m4/acl.m4 b/m4/acl.m4 index ce0fe6b..5036b0f 100644 --- a/m4/acl.m4 +++ b/m4/acl.m4 @@ -29,7 +29,7 @@ AC_DEFUN if test $ac_cv_header_sys_acl_h = yes; then ac_save_LIBS=$LIBS - dnl Test for POSIX-draft-like API (GNU/Linux, FreeBSD, Mac OS X, + dnl Test for POSIX-draft-like API (GNU/Linux, FreeBSD, macOS, dnl IRIX, Tru64). -lacl is needed on GNU/Linux, -lpacl on OSF/1. if test $use_acl = 0; then AC_SEARCH_LIBS([acl_get_file], [acl pacl], @@ -61,7 +61,7 @@ AC_DEFUN AC_DEFINE([HAVE_ACL_FIRST_ENTRY], [1], [Define to 1 if the constant ACL_FIRST_ENTRY exists.]) fi - dnl On Mac OS X, other types of ACLs are supported. + dnl On macOS, other types of ACLs are supported. AC_CACHE_CHECK([for ACL_TYPE_EXTENDED], [gl_cv_acl_ACL_TYPE_EXTENDED], [AC_COMPILE_IFELSE([AC_LANG_PROGRAM( diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4 index 76547d1..8535c065 100644 --- a/m4/getloadavg.m4 +++ b/m4/getloadavg.m4 @@ -22,7 +22,7 @@ AC_DEFUN gl_save_LIBS=$LIBS -# getloadvg is present in libc on glibc >= 2.2, Mac OS X, FreeBSD >= 2.0, +# getloadvg is present in libc on glibc >= 2.2, macOS, FreeBSD >= 2.0, # NetBSD >= 0.9, OpenBSD >= 2.0, Solaris >= 7. HAVE_GETLOADAVG=1 AC_CHECK_FUNC([getloadavg], [], diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4 index f8454c8..47a74af 100644 --- a/m4/gnulib-common.m4 +++ b/m4/gnulib-common.m4 @@ -30,7 +30,7 @@ AC_DEFUN [/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of earlier versions), but does not display it by setting __GNUC_STDC_INLINE__. - __APPLE__ && __MACH__ test for Mac OS X. + __APPLE__ && __MACH__ test for macOS. __APPLE_CC__ tests for the Apple compiler and its version. __STDC_VERSION__ tests for the C99 mode. */ #if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__ diff --git a/m4/largefile.m4 b/m4/largefile.m4 index 8bbdfaa..9f87203 100644 --- a/m4/largefile.m4 +++ b/m4/largefile.m4 @@ -133,7 +133,7 @@ AC_DEFUN *) dnl Nothing to do on gnulib's side. dnl A 64-bit off_t is - dnl - already the default on Mac OS X, FreeBSD, NetBSD, OpenBSD, IRIX, + dnl - already the default on macOS, FreeBSD, NetBSD, OpenBSD, IRIX, dnl OSF/1, Cygwin, dnl - enabled by _FILE_OFFSET_BITS=64 (ensured by AC_SYS_LARGEFILE) on dnl glibc, HP-UX, Solaris, diff --git a/m4/mktime.m4 b/m4/mktime.m4 index 23cad73..1e71d93 100644 --- a/m4/mktime.m4 +++ b/m4/mktime.m4 @@ -33,7 +33,7 @@ AC_DEFUN AC_CHECK_FUNCS_ONCE([tzset]) AC_REQUIRE([gl_MULTIARCH]) if test $APPLE_UNIVERSAL_BUILD = 1; then - # A universal build on Apple Mac OS X platforms. + # A universal build on Apple macOS platforms. # The test result would be 'yes' in 32-bit mode and 'no' in 64-bit mode. # But we need a configuration result that is valid in both modes. gl_cv_func_working_mktime=no diff --git a/m4/nocrash.m4 b/m4/nocrash.m4 index d8dd8f1..d54bff2 100644 --- a/m4/nocrash.m4 +++ b/m4/nocrash.m4 @@ -18,7 +18,7 @@ AC_DEFUN([GL_NOCRASH],[[ #include #if defined __MACH__ && defined __APPLE__ -/* Avoid a crash on Mac OS X. */ +/* Avoid a crash on macOS. */ #include #include #include diff --git a/msdos/autogen/config.in b/msdos/autogen/config.in index bcd51ce..f1c570c 100644 --- a/msdos/autogen/config.in +++ b/msdos/autogen/config.in @@ -788,7 +788,7 @@ along with GNU Emacs. If not, see . */ #undef HAVE_NLIST_H /* Define to 1 if you are using the NeXTstep API, either GNUstep or Cocoa on - Mac OS X. */ + macOS. */ #undef HAVE_NS /* Define to use native MS Windows GUI. */ @@ -1303,7 +1303,7 @@ along with GNU Emacs. If not, see . */ /* Define to 1 if `NSInteger' is defined. */ #undef NS_HAVE_NSINTEGER -/* Define to 1 if you are using NS windowing under MacOS X. */ +/* Define to 1 if you are using NS windowing under macOS. */ #undef NS_IMPL_COCOA /* Define to 1 if you are using NS windowing under GNUstep. */ @@ -1503,7 +1503,7 @@ along with GNU Emacs. If not, see . */ #ifndef _ALL_SOURCE # undef _ALL_SOURCE #endif -/* Enable general extensions on OS X. */ +/* Enable general extensions on macOS. */ #ifndef _DARWIN_C_SOURCE # undef _DARWIN_C_SOURCE #endif @@ -1734,7 +1734,7 @@ along with GNU Emacs. If not, see . */ /* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of earlier versions), but does not display it by setting __GNUC_STDC_INLINE__. - __APPLE__ && __MACH__ test for Mac OS X. + __APPLE__ && __MACH__ test for macOS. __APPLE_CC__ tests for the Apple compiler and its version. __STDC_VERSION__ tests for the C99 mode. */ #if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__ diff --git a/src/fileio.c b/src/fileio.c index 7aa5817..e790930 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -2237,12 +2237,12 @@ internal_delete_file (Lisp_Object filename) } /* Filesystems are case-sensitive on all supported systems except - MS-Windows, MS-DOS, Cygwin, and Mac OS X. They are always + MS-Windows, MS-DOS, Cygwin, and macOS. They are always case-insensitive on the first two, but they may or may not be - case-insensitive on Cygwin and OS X. The following function + case-insensitive on Cygwin and macOS. The following function attempts to provide a runtime test on those two systems. If the test is not conclusive, we assume case-insensitivity on Cygwin and - case-sensitivity on Mac OS X. + case-sensitivity on macOS. FIXME: Mounted filesystems on Posix hosts, like Samba shares or NFS-mounted Windows volumes, might be case-insensitive. Can we @@ -2254,13 +2254,13 @@ file_name_case_insensitive_p (const char *filename) /* Use pathconf with _PC_CASE_INSENSITIVE or _PC_CASE_SENSITIVE if those flags are available. As of this writing (2016-11-14), Cygwin is the only platform known to support the former (starting - with Cygwin-2.6.1), and Mac OS X is the only platform known to + with Cygwin-2.6.1), and macOS is the only platform known to support the latter. There have been reports that pathconf with _PC_CASE_SENSITIVE - does not work reliably on Mac OS X. If you have a problem, - please recompile Emacs with -D DARWIN_OS_CASE_SENSITIVE_FIXME=1 or - -D DARWIN_OS_CASE_SENSITIVE_FIXME=2, and file a bug report saying + does not work reliably on macOS. If you have a problem, + please recompile Emacs with -DDARWIN_OS_CASE_SENSITIVE_FIXME=1 or + -DDARWIN_OS_CASE_SENSITIVE_FIXME=2, and file a bug report saying whether this fixed your problem. */ #ifdef _PC_CASE_INSENSITIVE diff --git a/src/nsterm.m b/src/nsterm.m index 7e6ec85..5f3c81b 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -5956,7 +5956,7 @@ flag set (this is probably a bug in the OS). #ifdef NS_IMPL_COCOA -/* Needed to pick up Ctrl-tab and possibly other events that Mac OS X +/* Needed to pick up Ctrl-tab and possibly other events that macOS has decided not to send key-down for. See http://osdir.com/ml/editors.vim.mac/2007-10/msg00141.html This only applies on Tiger and earlier. -- 2.10.2