summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/ChangeLog.82
-rw-r--r--lisp/dos-w32.el2
-rw-r--r--lisp/mail/feedmail.el2
-rw-r--r--lisp/makefile.w32-in2
-rw-r--r--lisp/mh-e/ChangeLog.14
-rw-r--r--lisp/net/ange-ftp.el2
-rw-r--r--lisp/org/ChangeLog9
-rw-r--r--lisp/org/ob-lilypond.el18
-rw-r--r--lisp/printing.el2
10 files changed, 27 insertions, 18 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fc96da8a0e3..d55ecc7fd52 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -10434,7 +10434,7 @@
(tramp-completion-file-name-regexp-unified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-url): Don't use leading volume
- letter on win32 systems. (Bug#5303, Bug#9311)
+ letter on w32 systems. (Bug#5303, Bug#9311)
(tramp-drop-volume-letter): Simplify definition.
Suggested by Stefan Monnier <monnier@iro.umontreal.ca>.
diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8
index ccc9b473de3..0380fb117db 100644
--- a/lisp/ChangeLog.8
+++ b/lisp/ChangeLog.8
@@ -6906,7 +6906,7 @@
standard `print' and `nprint' programs, as well as `lpr' and
similar programs. Only write directly to the printer port if no
print program is specified. Work around a bug in Windows 9x
- affecting Win32 version of Emacs by invoking command.com to write
+ affecting the w32 version of Emacs by invoking command.com to write
to the printer port instead of writing directly.
(direct-print-region-function): Use direct-print-region-helper to
do most of the work.
diff --git a/lisp/dos-w32.el b/lisp/dos-w32.el
index f68af7a73be..4839d6b9239 100644
--- a/lisp/dos-w32.el
+++ b/lisp/dos-w32.el
@@ -361,7 +361,7 @@ filesystem mounted on drive Z:, FILESYSTEM could be \"Z:\"."
(apply 'call-process lpr-prog nil errbuf nil rest))
;; Run command.com to access printer port on Windows 9x, unless
;; we are supposed to append to an existing (non-empty) file,
- ;; to work around a bug in Windows 9x that prevents Win32
+ ;; to work around a bug in Windows 9x that prevents Windows
;; programs from accessing LPT ports reliably.
((and (eq system-type 'windows-nt)
(getenv "winbootdir")
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index c6d1d228780..520271940f2 100644
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -2334,7 +2334,7 @@ mapped to mostly alphanumerics for safety."
(if (and is-fqm is-in-this-dir)
(setq filename buffer-file-name)
(setq filename (feedmail-create-queue-filename queue-directory)))
- ;; make binary file on DOS/Win95/WinNT, etc
+ ;; make binary file on DOS/Windows 95/Windows NT, etc
(let ((buffer-file-type feedmail-force-binary-write))
(write-file filename))
;; convenient for moving from draft to q, for example
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index c7d883e4295..756d2b949fa 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/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.
# This file is part of GNU Emacs.
diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1
index 94ac7a2f3b7..15b7380b737 100644
--- a/lisp/mh-e/ChangeLog.1
+++ b/lisp/mh-e/ChangeLog.1
@@ -9493,9 +9493,9 @@
* mh-utils.el (mh-find-progs): Run PATH search only when mh-progs,
mh-lib and mh-lib-progs are not all already set. This allows the
user to set them using a simple setq prior to loading mh-e. This
- is useful for implementation of mh-e on win32. Note that many
+ is useful for implementation of mh-e on w32. Note that many
commands still call mh-find-path which also parses the mh_profile
- file (that may still fail on win32), so this is still done often.
+ file (that may still fail on w32), so this is still done often.
But it lets us change the mh_profile file and have mh-e see the
changed file without exiting emacs and starting over so I left
that in.
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index dd695c29c78..1501fa41baa 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -2618,7 +2618,7 @@ away in the internal cache."
(format
"list data file %s not readable"
temp))))
- ;; remove ^M inserted by the win32 ftp client
+ ;; remove ^M inserted by the w32 ftp client
(while (re-search-forward "\r$" nil t)
(replace-match ""))
(goto-char 1)
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index eae83f044a0..cf9c32006ac 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,12 @@
+2012-07-29 Paul Eggert <eggert@cs.ucla.edu>
+
+ Don't use the abbreviation "win" to refer to Windows (Bug#10421).
+ * 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.
+
2012-06-02 Chong Yidong <cyd@gnu.org>
* org-clock.el (org-clock-string-limit)
diff --git a/lisp/org/ob-lilypond.el b/lisp/org/ob-lilypond.el
index a1e4c9f83e4..b3e77f32e55 100644
--- a/lisp/org/ob-lilypond.el
+++ b/lisp/org/ob-lilypond.el
@@ -66,9 +66,9 @@ the midi file is not automatically played. Default value is t")
(defvar ly-nix-pdf-path "evince")
(defvar ly-nix-midi-path "timidity")
-(defvar ly-win32-ly-path "lilypond")
-(defvar ly-win32-pdf-path "")
-(defvar ly-win32-midi-path "")
+(defvar ly-w32-ly-path "lilypond")
+(defvar ly-w32-pdf-path "")
+(defvar ly-w32-midi-path "")
(defvar ly-gen-png nil
"Image generation (png) can be turned on by default by setting
@@ -329,8 +329,8 @@ If TEST is non-nil, it contains a simulation of the OS for test purposes"
(or test system-type)))
(cond ((string= sys-type "darwin")
ly-OSX-ly-path)
- ((string= sys-type "win32")
- ly-win32-ly-path)
+ ((string= sys-type "windows-nt")
+ ly-w32-ly-path)
(t ly-nix-ly-path))))
(defun ly-determine-pdf-path (&optional test)
@@ -341,8 +341,8 @@ If TEST is non-nil, it contains a simulation of the OS for test purposes"
(or test system-type)))
(cond ((string= sys-type "darwin")
ly-OSX-pdf-path)
- ((string= sys-type "win32")
- ly-win32-pdf-path)
+ ((string= sys-type "windows-nt")
+ ly-w32-pdf-path)
(t ly-nix-pdf-path))))
(defun ly-determine-midi-path (&optional test)
@@ -353,8 +353,8 @@ If TEST is non-nil, it contains a simulation of the OS for test purposes"
(or test test system-type)))
(cond ((string= sys-type "darwin")
ly-OSX-midi-path)
- ((string= sys-type "win32")
- ly-win32-midi-path)
+ ((string= sys-type "windows-nt")
+ ly-w32-midi-path)
(t ly-nix-midi-path))))
(defun ly-toggle-midi-play ()
diff --git a/lisp/printing.el b/lisp/printing.el
index bf5b8a91f01..0152ed63dbb 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -2141,7 +2141,7 @@ Useful links:
`http://bama.ua.edu/cgi-bin/man-cgi?lp'
`http://www.mediacollege.com/cgi-bin/man/page.cgi?section=all&topic=lp'
-* GNU utilities for Win32 (cp.exe)
+* GNU utilities for w32 (cp.exe)
`http://unxutils.sourceforge.net/'
"
:type '(repeat
View Lorry Controller Status