diff options
author | Bastien Guerry <bzg@altern.org> | 2012-03-21 15:26:25 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2012-03-21 15:26:25 +0100 |
commit | e19820b38491e373dc8a84acc0f726594d8ad5c8 (patch) | |
tree | d270eebf302948ba17c6b181b37cfd1f98d8a015 | |
parent | eb84020a9fd4eae01b18bc8f4bd2ef1fc9e4d25d (diff) | |
parent | 51c5680aa0403c04b432f3ed21b16ba5b9a7a783 (diff) | |
download | org-mode-e19820b38491e373dc8a84acc0f726594d8ad5c8.tar.gz |
Merge branch 'hotfix-7.8.06'
Conflicts:
lisp/ob-lilypond.el
testing/lisp/test-ob-lilypond.el
-rw-r--r-- | lisp/ob-lilypond.el | 18 | ||||
-rw-r--r-- | testing/lisp/test-ob-lilypond.el | 10 |
2 files changed, 4 insertions, 24 deletions
diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el index 0e9b0c6..8bd7cad 100644 --- a/lisp/ob-lilypond.el +++ b/lisp/ob-lilypond.el @@ -3,8 +3,8 @@ ;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Martyn Jago -;; Keywords: babel language, literate programming, music score -;; Homepage: https://github.com/mjago/ob-lilypond +;; Keywords: babel language, literate programming +;; Homepage: http://orgmode.org/worg/org-contrib/babel/languages/ob-doc-lilypond.html ;; This file is part of GNU Emacs. @@ -34,10 +34,9 @@ (require 'ob) (require 'ob-eval) (require 'ob-tangle) +(require 'outline) (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 '() @@ -45,9 +44,6 @@ NOTE: The arguments are determined at lilypond compile time. See (ly-set-header-args)") -(defconst ly-version "7.6" - "The version number of the file ob-lilypond.el.") - (defvar ly-compile-post-tangle t "Following the org-babel-tangle (C-c C-v t) command, ly-compile-post-tangle determines whether ob-lilypond should @@ -437,13 +433,7 @@ If TEST is non-nil, it contains a simulation of the OS for test purposes" (message (concat "Arrange mode has been " (if ly-arrange-mode "ENABLED." "DISABLED.")))) -(defun ly-version (&optional insert-at-point) - (interactive) - (let ((version (format "ob-lilypond version %s" ly-version))) - (when insert-at-point (insert version)) - (message version))) - - (defun ly-switch-extension (file-name ext) +(defun ly-switch-extension (file-name ext) "Utility command to swap current FILE-NAME extension with EXT" (concat (file-name-sans-extension diff --git a/testing/lisp/test-ob-lilypond.el b/testing/lisp/test-ob-lilypond.el index 306c48a..1a60eab 100644 --- a/testing/lisp/test-ob-lilypond.el +++ b/testing/lisp/test-ob-lilypond.el @@ -38,16 +38,6 @@ (should-error (org-babel-prep-session:lilypond nil nil)) :type 'error) -(ert-deftest ob-lilypond/ly-version-const () - (should (boundp 'ly-version))) - -(ert-deftest ob-lilypond/ly-version-command () - (should (equal "ob-lilypond version 7.6" (ly-version))) - (with-temp-buffer - (ly-version t) - (should (equal "ob-lilypond version 7.6" - (buffer-substring (point-min) (point-max)))))) - (ert-deftest ob-lilypond/ly-compile-lilyfile () (should (equal `(,(ly-determine-ly-path) ;program |