diff options
| author | Bastien Guerry <bzg@gnu.org> | 2020-12-13 13:44:15 +0100 |
|---|---|---|
| committer | Bastien Guerry <bzg@gnu.org> | 2020-12-13 13:44:15 +0100 |
| commit | f22856a5c54d99867cd24c08a14bbda23d5c6229 (patch) | |
| tree | b6bd688963531eccb8b9d18195df0edfc34ba59d /lisp/org/ob-lilypond.el | |
| parent | 6aa9fe3e1b4052b2acde86404a90e35893ebfa00 (diff) | |
| download | emacs-f22856a5c54d99867cd24c08a14bbda23d5c6229.tar.gz | |
Update to Org 9.4.1
Diffstat (limited to 'lisp/org/ob-lilypond.el')
| -rw-r--r-- | lisp/org/ob-lilypond.el | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lisp/org/ob-lilypond.el b/lisp/org/ob-lilypond.el index eb3372fa7bf..af66cc8a011 100644 --- a/lisp/org/ob-lilypond.el +++ b/lisp/org/ob-lilypond.el @@ -67,12 +67,15 @@ the midi file is not automatically played. Default value is t") (defvar org-babel-lilypond-ly-command "" "Command to execute lilypond on your system. Do not set it directly. Customize `org-babel-lilypond-commands' instead.") + (defvar org-babel-lilypond-pdf-command "" "Command to show a PDF file on your system. Do not set it directly. Customize `org-babel-lilypond-commands' instead.") + (defvar org-babel-lilypond-midi-command "" "Command to play a MIDI file on your system. Do not set it directly. Customize `org-babel-lilypond-commands' instead.") + (defcustom org-babel-lilypond-commands (cond ((eq system-type 'darwin) @@ -94,7 +97,8 @@ you can leave the string empty on this case." :version "24.4" :package-version '(Org . "8.2.7") :set - (lambda (_symbol value) + (lambda (symbol value) + (set symbol value) (setq org-babel-lilypond-ly-command (nth 0 value) org-babel-lilypond-pdf-command (nth 1 value) @@ -201,7 +205,7 @@ If error in compilation, attempt to mark the error in lilypond org file." (delete-file org-babel-lilypond-temp-file)) (rename-file org-babel-lilypond-tangled-file org-babel-lilypond-temp-file)) - (switch-to-buffer-other-window "*lilypond*") + (org-switch-to-buffer-other-window "*lilypond*") (erase-buffer) (org-babel-lilypond-compile-lilyfile org-babel-lilypond-temp-file) (goto-char (point-min)) @@ -258,7 +262,7 @@ FILE-NAME is full path to lilypond file." "Mark the erroneous lines in the lilypond org buffer. FILE-NAME is full path to lilypond file. LINE is the erroneous line." - (switch-to-buffer-other-window + (org-switch-to-buffer-other-window (concat (file-name-nondirectory (org-babel-lilypond-switch-extension file-name ".org")))) (let ((temp (point))) @@ -387,7 +391,8 @@ If TEST is non-nil, the shell command is returned and is not run." (defun org-babel-lilypond-switch-extension (file-name ext) "Utility command to swap current FILE-NAME extension with EXT." (concat (file-name-sans-extension - file-name) ext)) + file-name) + ext)) (defun org-babel-lilypond-get-header-args (mode) "Default arguments to use when evaluating a lilypond source block. |