Don't use the abbreviation "win" to refer to Windows (Bug#10421).

* lisp/org/ob-lilypond.el (ly-w32-ly-path): Rename from ly-win32-ly-path.
(ly-w32-pdf-path): Rename from ly-win32-pdf-path.
(ly-w32-midi-path): Rename from ly-win32-midi-path.
(ly-determine-ly-path, ly-determine-pdf-path, ly-determine-midi-path):
Check for "windows-nt", not "win32", in system-type.
* src/regex.c (MAX_BUF_SIZE): Remove some incorrect and
long-ago-commented-out code that talks about "WIN32".
* src/w32heap.h (OS_WINDOWS_95): Rename from OS_WIN95.
All uses changed.

4 files changed, 10 insertions, 10 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index f0e9f247d14..4db23d045a8 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -905,7 +905,7 @@
 
 2008-04-04  Jason Rumney  <jasonr@gnu.org>
 
-	* INSTALL: Update W32 API requirements.
+	* INSTALL: Update Windows API requirements.
 
 2008-04-03  Jason Rumney  <jasonr@gnu.org>
 
@@ -2322,7 +2322,7 @@
 	* makefile.def (CP_DIR): Use platform independent switches for xcopy.
 
 	* makefile.nt (install, fast_install, real_install, clean):
-	Don't use switches to del not supported by Win95.
+	Don't use switches to del not supported by Windows 95.
 
 1995-11-07  Kevin Gallo  <kgallo@microsoft.com>
 
@@ -2376,7 +2376,7 @@
 1995-05-27  Geoff Voelker  <voelker@cs.washington.edu>
 
 	* ebuild.bat, emacs.bat, fast-install.bat, install.bat:
-	Add carriage returns; necessary for batch files on Win95.
+	Add carriage returns; necessary for batch files on Windows 95.
 
 1995-05-25  Geoff Voelker  <voelker@cs.washington.edu>
 
diff --git a/nt/INSTALL b/nt/INSTALL
index 96ef52faf5e..2293610adf3 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -121,7 +121,7 @@
 
   To compile Emacs, you will need either Microsoft Visual C++ 2.0, or
   later and nmake, or a Windows port of GCC 2.95 or later with MinGW
-  and W32 API support and a port of GNU Make.  You can use the Cygwin
+  and Windows API support and a port of GNU Make.  You can use the Cygwin
   ports of GCC, but Emacs requires the MinGW headers and libraries to
   build (latest versions of the Cygwin toolkit, at least since v1.3.3,
   include the MinGW headers and libraries as an integral part).
@@ -591,7 +591,7 @@
 * Trouble-shooting
 
   The main problems that are likely to be encountered when building
-  Emacs stem from using an old version of GCC, or old MinGW or W32 API
+  Emacs stem from using an old version of GCC, or old MinGW or Windows API
   headers.  Additionally, Cygwin ports of GNU make may require the Emacs
   source tree to be mounted with text!=binary, because the makefiles
   generated by configure.bat necessarily use DOS line endings.  Also,
@@ -603,7 +603,7 @@
   2.95 or later is needed, because that is when the Windows port gained
   sufficient support for anonymous structs and unions to cope with some
   definitions from winnt.h that are used by addsection.c.
-  Older versions of the W32 API headers that come with Cygwin and MinGW
+  Older versions of the Windows API headers that come with Cygwin and MinGW
   may be missing some definitions required by Emacs, or broken in other
   ways.  In particular, uniscribe APIs were added to MinGW CVS only on
   2006-03-26, so releases from before then cannot be used.
diff --git a/nt/configure.bat b/nt/configure.bat
index e91165de473..56793a0d1c3 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -23,7 +23,7 @@ rem   YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS:
 rem

 rem   + MS Windows 95, NT or later

 rem   + either MSVC 2.x or later, or gcc-2.95 or later (with GNU make 3.75

-rem     or later) and the Mingw32 and W32 API headers and libraries.

+rem     or later) and the Mingw32 and Windows API headers and libraries.

 rem   + Visual Studio 2005 is not supported at this time.

 rem

 rem For reference, here is a list of which builds of GNU make are known to

@@ -426,7 +426,7 @@ rem   problem).  The gcc/mingw32 2.95.2 headers are okay, as are distros
 rem   of w32api-xxx.zip from Anders Norlander since 1999-11-18 at least.

 rem   Beginning with Emacs 23, we need usp10.h.

 rem

-echo Checking whether W32 API headers are too old...

+echo Checking whether Windows API headers are too old...

 echo #include "windows.h" >junk.c

 echo #include "usp10.h" >>junk.c

 echo test(PIMAGE_NT_HEADERS pHeader) >>junk.c

@@ -469,7 +469,7 @@ goto end
 echo.

 echo Configure failed.

 echo To configure Emacs for Windows, you need to have either

-echo gcc-2.95 or later with Mingw32 and the W32 API headers,

+echo gcc-2.95 or later with Mingw32 and the Windows API headers,

 echo or MSVC 2.x or later.

 del junk.c

 goto end

diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 274ce7e5271..fc5ecefd173 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -1,4 +1,4 @@
-# -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
+# -*- Makefile -*- for GNU Emacs on the Microsoft Windows API.
 # Copyright (C) 2000-2012 Free Software Foundation, Inc.
 #
 # Top level makefile for building GNU Emacs on Windows NT