diff options
| author | Bastien Guerry <bzg@altern.org> | 2012-09-30 08:47:16 +0200 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2012-09-30 08:47:16 +0200 |
| commit | cde9275e513215d16e6e03e64392897630bdcd27 (patch) | |
| tree | d3cc84bd51c9cd3178fc5e72426948e147a49927 | |
| parent | f60955a21a2aa55f760fb2c81d5e338c01ef3cec (diff) | |
| download | org-mode-cde9275e513215d16e6e03e64392897630bdcd27.tar.gz | |
ob-lilypond.el: Backport change by Paul Eggert in Emacs trunk
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.
See http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=607bfb
| -rw-r--r-- | lisp/ob-lilypond.el | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el index 6ee1949..e19b0c3 100644 --- a/lisp/ob-lilypond.el +++ b/lisp/ob-lilypond.el @@ -72,9 +72,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 @@ -333,8 +333,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) @@ -344,8 +344,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) @@ -355,8 +355,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 () |