Merge from origin/emacs-25

4af5981 Add a comment in generated refcards about the source
ef880a5 ; * etc/refcards/calccard.tex: Remove obsolete comment.
4887e7c js-mode: Fix indent problem after a regexp
e992ac0 Fix sluggish display of symbols in UTF-8 language environment
1fc101b Don't confuse how Texinfo outputs @var with the input
91aa5d1 * doc/lispref/display.texi (Scroll Bars): * doc/lispref/frame...
f758fcd * doc/emacs/cmdargs.texi (Initial Options): Copyedit for --da...
5b0cddd More fixes in copyright notices in etc/refcards/
f994c20 Update copyright text in refcards
9ad2ae7 Fix Outline command names
26c3554 Send text received by bracketed paste to process
db0b58d Correct the statement about programming modes always running ...
78aece4 Improve documentation of 'occur'
eb364fd Do call debugger on failed cl-assert
3ef4ee8 Avoid infloop in python
8da810f Don't refer to obsolete FEATURE-unload-hook
4f478ca Improve documentation of dabbrevs
7272e5d * lisp/chistory.el (list-command-history): Doc fix.  (Bug#24890)
89b7482 * lisp/simple.el (set-mark-command): Doc fix.  (Bug#24890)
3b199f7 Improve documentation of some Help commands
93d3a0e Fix documentation of yes-or-no prompts
af04919 Fix documentation of partial completion style
ed80184 Fix documentation of the mode line on emacsclient frames
e6be855 Fix description of 'C-z' in User manual
16f7007 Improve and clarify documentation of Outline Mode
31d93aa Add Emacs version number to nt/README.W32
0b6b815 Fix python-mode hideshow regexp
dc152c5 Modernize usage of 'macOS' in doc and comments
84c5343 Prefer comments /* like this */ in C code
bb61e50 * doc/lispref/loading.texi (Autoload): Better link (Bug#24845).
3ef86fd Clarify documentation of face attribute functions
de51d59 ; * nt/README.W32: Minor copyedits.
db436e9 Don't call debug on failed cl-assert

# Conflicts:
#	doc/emacs/cmdargs.texi
#	etc/NEWS
#	etc/PROBLEMS
#	lisp/auth-source.el
#	lisp/net/tramp-sh.el

1 files changed, 2 insertions, 2 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 5e6146b33d8..487c1501bb9 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -21,7 +21,7 @@ WINDOWSNT	Compiling the native MS-Windows (W32) port.
 __MINGW32__     Compiling the W32 port with the MinGW or MinGW-w64 ports of GCC.
 _MSC_VER        Compiling the W32 port with the Microsoft C compiler.
 MINGW_W64       Compiling the W32 port with the MinGW-w64 port of GCC.
-DARWIN_OS       Compiling on Mac OS X or pure Darwin (and using s/darwin.h).
+DARWIN_OS       Compiling on macOS or pure Darwin (and using s/darwin.h).
 SOLARIS2
 USG
 USG5_4
@@ -29,7 +29,7 @@ USG5_4
 ** Distinguishing GUIs **
 
 HAVE_NTGUI      Use the native W32 GUI for windows, frames, menus&scrollbars.
-HAVE_NS         Use the NeXT/OpenStep/Cocoa UI under Mac OS X or GNUstep.
+HAVE_NS         Use the NeXT/OpenStep/Cocoa UI under macOS or GNUstep.
 NS_IMPL_GNUSTEP Compile support for GNUstep implementation of NS GUI API.
 NS_IMPL_COCOA   Compile support for Cocoa (Apple) implementation of NS GUI API.
 HAVE_X11        Compile support for the X11 GUI.