mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-29 19:37:52 +00:00
Merge branch 'maint'
This commit is contained in:
commit
968117b19d
|
@ -67,12 +67,15 @@ the midi file is not automatically played. Default value is t")
|
||||||
(defvar org-babel-lilypond-ly-command ""
|
(defvar org-babel-lilypond-ly-command ""
|
||||||
"Command to execute lilypond on your system.
|
"Command to execute lilypond on your system.
|
||||||
Do not set it directly. Customize `org-babel-lilypond-commands' instead.")
|
Do not set it directly. Customize `org-babel-lilypond-commands' instead.")
|
||||||
|
|
||||||
(defvar org-babel-lilypond-pdf-command ""
|
(defvar org-babel-lilypond-pdf-command ""
|
||||||
"Command to show a PDF file on your system.
|
"Command to show a PDF file on your system.
|
||||||
Do not set it directly. Customize `org-babel-lilypond-commands' instead.")
|
Do not set it directly. Customize `org-babel-lilypond-commands' instead.")
|
||||||
|
|
||||||
(defvar org-babel-lilypond-midi-command ""
|
(defvar org-babel-lilypond-midi-command ""
|
||||||
"Command to play a MIDI file on your system.
|
"Command to play a MIDI file on your system.
|
||||||
Do not set it directly. Customize `org-babel-lilypond-commands' instead.")
|
Do not set it directly. Customize `org-babel-lilypond-commands' instead.")
|
||||||
|
|
||||||
(defcustom org-babel-lilypond-commands
|
(defcustom org-babel-lilypond-commands
|
||||||
(cond
|
(cond
|
||||||
((eq system-type 'darwin)
|
((eq system-type 'darwin)
|
||||||
|
@ -94,7 +97,8 @@ you can leave the string empty on this case."
|
||||||
:version "24.4"
|
:version "24.4"
|
||||||
:package-version '(Org . "8.2.7")
|
:package-version '(Org . "8.2.7")
|
||||||
:set
|
:set
|
||||||
(lambda (_symbol value)
|
(lambda (symbol value)
|
||||||
|
(set symbol value)
|
||||||
(setq
|
(setq
|
||||||
org-babel-lilypond-ly-command (nth 0 value)
|
org-babel-lilypond-ly-command (nth 0 value)
|
||||||
org-babel-lilypond-pdf-command (nth 1 value)
|
org-babel-lilypond-pdf-command (nth 1 value)
|
||||||
|
|
Loading…
Reference in a new issue