diff options
author | Bastien Guerry <bzg@altern.org> | 2011-07-08 09:59:28 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2011-07-08 09:59:28 +0200 |
commit | 0a0fb300f3bfc6b8863e55faf636e4e82a464a06 (patch) | |
tree | 6c79077aba716cd55592bc63372e17f03ce94285 | |
parent | dc59011473063715619d59c915de2ebae8325005 (diff) | |
parent | 197d23cc6fa8a7a70844556d4697bb2ae7d5c6eb (diff) | |
download | org-mode-0a0fb300f3bfc6b8863e55faf636e4e82a464a06.tar.gz |
Merge branch 'master' of orgmode.org:org-mode
-rw-r--r-- | Makefile | 3 | ||||
-rw-r--r-- | lisp/ob-lilypond.el | 14 |
2 files changed, 12 insertions, 5 deletions
@@ -156,7 +156,8 @@ LISPF = org.el \ ob-plantuml.el \ ob-org.el \ ob-js.el \ - ob-scheme.el + ob-scheme.el \ + ob-lilypond.el LISPFILES0 = $(LISPF:%=lisp/%) LISPFILES = $(LISPFILES0) lisp/org-install.el diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el index fc6b350..6971a69 100644 --- a/lisp/ob-lilypond.el +++ b/lisp/ob-lilypond.el @@ -31,8 +31,14 @@ (require 'ob) (require 'ob-eval) (defalias 'lilypond-mode 'LilyPond-mode) + +(declare-function show-all "outline" ()) + (add-to-list 'org-babel-tangle-lang-exts '("LilyPond" . "ly")) +(defvar org-babel-default-header-args:lilypond '() + "Default header arguments for js code blocks.") + (defconst ly-version "0.3" "The version number of the file ob-lilypond.el.") @@ -137,10 +143,10 @@ specific arguments to =org-babel-tangle=" (out-file (cdr (assoc :file params))) (cmdline (or (cdr (assoc :cmdline params)) "")) - (in-file (org-babel-temp-file "dot-"))) + (in-file (org-babel-temp-file "lilypond-"))) (with-temp-file in-file - (insert (org-babel-expand-body:dot body params))) + (insert (org-babel-expand-body:generic body params))) (org-babel-eval (concat @@ -404,9 +410,9 @@ If TEST is non-nil, it contains a simulation of the OS for test purposes" (defun ly-version (&optional insert-at-point) (interactive) - (setq version (format "ob-lilypond version %s" ly-version)) + (let ((version (format "ob-lilypond version %s" ly-version))) (when insert-at-point (insert version)) - (message version)) + (message version))) (defun ly-switch-extension (file-name ext) "Utility command to swap current FILE-NAME extension with EXT" |