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.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/ChangeLog.7 b/src/ChangeLog.7
index 0952826e8c6..ce240ab2928 100644
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -2070,7 +2070,7 @@
         (sys_select): Ignore children dead children with pending input.
         Delay sending SIGCHLD until all output has been read.
         (sys_kill): Sleep to allow focus change events to propagate.
-        Use TerminateProcess on Win95.
+        Use TerminateProcess on Windows 95.
         (int_from_hex, enum_locale_fn, Fw32_get_valid_locale_ids):
         New functions.
         (Vw32_valid_locale_ids): New variable.
@@ -5719,13 +5719,13 @@
         Loop over handles round robin to ensure fairness.
         (sys_kill): Send ctrl-break and ctrl-c keystrokes to subprocesses
         on SIGINT if not sharing consoles, otherwise generate ctrl-break event.
-        On other termination signals, send WM_QUIT message to Win95 apps
+        On other termination signals, send WM_QUIT message to Windows 95 apps
         and WM_CLOSE to NT apps.
         (syms_of_ntproc): Intern new symbols.  defsubr new functions.
         DEFVAR new variables.
 
-        * w32term.c (SIF_*): Win95 macros defined for NT.
-        (struct tagSCROLLINFO): Win95 struct defined for NT.
+        * w32term.c (SIF_*): Windows 95 macros defined for NT.
+        (struct tagSCROLLINFO): Windows 95 struct defined for NT.
         (vertical_scroll_bar_min_handle, vertical_scroll_bar_top_border)
         (vertical_scroll_bar_bottom_border, last_scroll_bar_drag_pos)
         (Vw32_gab_focus_on_raise, Vw32_capslock_is_shiftlock):