Merge from origin/emacs-26

317b354 ; Add notes about cross-compiling macOS versions
4b176eb Fix macOS run-time feature check
c03574b * etc/NEWS-*: Fix capitalization of "Emacs"

# Conflicts:
#	etc/NEWS

8 files changed, 41 insertions, 7 deletions

diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17
index c74cc3de71a..0ee3a2a11ce 100644
--- a/etc/NEWS.1-17
+++ b/etc/NEWS.1-17
@@ -4,7 +4,7 @@ Copyright (C) 1985-1986, 2006-2018 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
-This file is about changes in emacs versions 1 through 17.
+This file is about changes in Emacs versions 1 through 17.
 
 
 
diff --git a/etc/NEWS.18 b/etc/NEWS.18
index 81b1a396543..2c014d26029 100644
--- a/etc/NEWS.18
+++ b/etc/NEWS.18
@@ -4,7 +4,7 @@ Copyright (C) 1988, 2006-2018 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
-This file is about changes in emacs version 18.
+This file is about changes in Emacs version 18.
 
 
 
diff --git a/etc/NEWS.19 b/etc/NEWS.19
index 1f84e87cefc..66eadb8e24a 100644
--- a/etc/NEWS.19
+++ b/etc/NEWS.19
@@ -4,7 +4,7 @@ Copyright (C) 1993-1995, 2001, 2006-2018 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
-This file is about changes in emacs versions 19.
+This file is about changes in Emacs versions 19.
 
 
 
diff --git a/etc/NEWS.20 b/etc/NEWS.20
index 398148bf573..d4a5b8cbb79 100644
--- a/etc/NEWS.20
+++ b/etc/NEWS.20
@@ -7,7 +7,7 @@ See the end of the file for license conditions.
 Please send Emacs bug reports to bug-gnu-emacs@gnu.org.
 If possible, use M-x report-emacs-bug.
 
-This file is about changes in emacs version 20.
+This file is about changes in Emacs version 20.
 
 
 
diff --git a/etc/NEWS.21 b/etc/NEWS.21
index ea4f4212ee0..4a22109e0b5 100644
--- a/etc/NEWS.21
+++ b/etc/NEWS.21
@@ -4,7 +4,7 @@ Copyright (C) 2000-2018 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
-This file is about changes in emacs version 21.
+This file is about changes in Emacs version 21.
 
 
 
diff --git a/etc/NEWS.26 b/etc/NEWS.26
index 399508cacc5..043573e3fca 100644
--- a/etc/NEWS.26
+++ b/etc/NEWS.26
@@ -178,6 +178,11 @@ optional argument to do so.
 
 * Changes in Emacs 26.2 on Non-Free Operating Systems
 
+** macOS features can now be detected at run-time as well as at
+build-time.  See nextstep/INSTALL for details.
+(This change was actually made in Emacs 26.1, but was undocumented and
+not called out in its NEWS.)
+
 
 * Installation Changes in Emacs 26.1
 
diff --git a/nextstep/INSTALL b/nextstep/INSTALL
index 64f8f8fcf70..726a897c371 100644
--- a/nextstep/INSTALL
+++ b/nextstep/INSTALL
@@ -45,6 +45,35 @@ files will be installed under whatever 'prefix' is set to (defaults to
 require 'sudo' for "make install").
 
 
+Targeting different macOS versions
+----------------------------------
+
+The Emacs build process automatically enables or disables macOS
+features according to the version of macOS it is being built on.  It
+is possible to override this automatic configuration if you are
+targeting a different version of macOS, or wish to build one
+executable that is able to enable or disable features at run-time.
+
+To build a version compatible with an older version of macOS use this
+flag:
+
+  -DMAC_OS_X_VERSION_MIN_REQUIRED=x
+
+and to build for a newer version of macOS:
+
+  -DMAC_OS_X_VERSION_MAX_ALLOWED=x
+
+For example, to enable run-time checks for features available between
+macOS 10.6, and 10.12 inclusive:
+
+  ./configure --with-ns CFLAGS="-DMAC_OS_X_VERSION_MIN_REQUIRED=1060 \
+    -DMAC_OS_X_VERSION_MAX_ALLOWED=101200 -g3 -O2"
+
+The macOS version numbers are formatted as 10x0 for macOS up to 10.10,
+and 10xx00 for macOS 10.10 and above.  A full list is provided in
+/usr/include/AvailabilityMacros.h.
+
+
 Installation
 ------------
 
diff --git a/src/nsterm.m b/src/nsterm.m
index 6ba867d27c0..6c285f0abb7 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1949,7 +1949,7 @@ x_set_parent_frame (struct frame *f, Lisp_Object new_value, Lisp_Object old_valu
           [[child parentWindow] removeChildWindow:child];
 #if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
 #if MAC_OS_X_VERSION_MIN_REQUIRED < 101000
-          if ([child respondsToSelector:@selector(setAccessibilitySubrole:)]
+          if ([child respondsToSelector:@selector(setAccessibilitySubrole:)])
 #endif
               [child setAccessibilitySubrole:NSAccessibilityStandardWindowSubrole];
 #endif
@@ -1963,7 +1963,7 @@ x_set_parent_frame (struct frame *f, Lisp_Object new_value, Lisp_Object old_valu
                          ordered: NSWindowAbove];
 #if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
 #if MAC_OS_X_VERSION_MIN_REQUIRED < 101000
-          if ([child respondsToSelector:@selector(setAccessibilitySubrole:)]
+          if ([child respondsToSelector:@selector(setAccessibilitySubrole:)])
 #endif
               [child setAccessibilitySubrole:NSAccessibilityFloatingWindowSubrole];
 #endif