diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-07-29 01:18:29 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-07-29 01:18:29 -0700 |
| commit | b46a6a83b3c30d34aa6b80633394c74e6145291c (patch) | |
| tree | 70cf89c43b7663acf77c2e54f2ed644d1eb18a4e /lisp/org | |
| parent | 72b255c7e7856eb0abefb1149211a8be519f6fef (diff) | |
| download | emacs-b46a6a83b3c30d34aa6b80633394c74e6145291c.tar.gz | |
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.
Diffstat (limited to 'lisp/org')
| -rw-r--r-- | lisp/org/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/org/ob-lilypond.el | 18 |
2 files changed, 18 insertions, 9 deletions
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 () |