[O] [patch][babel] ob-lilypond maintenance
Maintenance patches: 1) Fix compiler warning 2) Leave versioning to Org 3) Set `no cache' default in audition mode 4) Redirect `homepage' to Worg Best, Martyn From 5fc49bc167c8fcc194c1c5761ea25c0a625500cb Mon Sep 17 00:00:00 2001 From: Martyn Jago martyn.j...@btinternet.com Date: Wed, 21 Mar 2012 09:31:53 + Subject: [PATCH 1/4] Fix compiler warning. * lisp/ob-lilypond.el: Fix compiler warning. --- lisp/ob-lilypond.el |3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el index 0e9b0c6..0404c7e 100644 --- a/lisp/ob-lilypond.el +++ b/lisp/ob-lilypond.el @@ -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 '() -- 1.7.3.4 From 16bd78584237ed5699b4fe8615a8f62329b7e811 Mon Sep 17 00:00:00 2001 From: Martyn Jago martyn.j...@btinternet.com Date: Wed, 21 Mar 2012 09:33:34 + Subject: [PATCH 2/4] Leave versioning to Org. * lisp/ob-lilypond.el: Leave versioning to Org * testing/lisp/test-ob-lilypond.el: Leave versioning to Org --- lisp/ob-lilypond.el | 11 +-- testing/lisp/test-ob-lilypond.el | 10 -- 2 files changed, 1 insertions(+), 20 deletions(-) diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el index 0404c7e..84b4c1d 100644 --- a/lisp/ob-lilypond.el +++ b/lisp/ob-lilypond.el @@ -44,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 @@ -436,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 -- 1.7.3.4 From 4bb6929dc2d4514a58900c3fe1b77dbed7f95ebf Mon Sep 17 00:00:00 2001 From: Martyn Jago martyn.j...@btinternet.com Date: Wed, 21 Mar 2012 09:35:44 + Subject: [PATCH 3/4] Set no cache default in audition mode. * lisp/ob-lilypond.el: Set no cache default in audition mode. * testing/lisp/test-ob-lilypond.el: Set no cache default in audition mode. --- lisp/ob-lilypond.el |1 - testing/lisp/test-ob-lilypond.el |2 -- 2 files changed, 0 insertions(+), 3 deletions(-) diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el index 84b4c1d..d77c5b6 100644 --- a/lisp/ob-lilypond.el +++ b/lisp/ob-lilypond.el @@ -447,7 +447,6 @@ mode i.e. ARRANGE-MODE is t '((:tangle . yes) (:noweb . yes) (:results . silent) - (:cache . yes) (:comments . yes))) (t '((:results . file) diff --git a/testing/lisp/test-ob-lilypond.el b/testing/lisp/test-ob-lilypond.el index 1a60eab..16cb055 100644 --- a/testing/lisp/test-ob-lilypond.el +++ b/testing/lisp/test-ob-lilypond.el @@ -354,7 +354,6 @@ (should (equal '((:tangle . yes) (:noweb . yes) (:results . silent) - (:cache . yes) (:comments . yes)) (ly-set-header-args t))) (should (equal '((:results . file) @@ -366,7 +365,6 @@ (should (equal '((:tangle . yes) (:noweb . yes) (:results . silent) - (:cache . yes) (:comments . yes)) org-babel-default-header-args:lilypond)) (ly-set-header-args nil) -- 1.7.3.4 From 7be76f27ecc67f720642fe97006a9426ee7d7328 Mon Sep 17 00:00:00 2001 From: Martyn Jago
Re: [O] [patch][babel] ob-lilypond maintenance
Hi Martyn, Martyn Jago martyn.j...@btinternet.com writes: Maintenance patches: 1) Fix compiler warning 2) Leave versioning to Org 3) Set `no cache' default in audition mode 4) Redirect `homepage' to Worg Thanks a lot. Patch #1 applies correctly on hotfix-7.8.06 and master. #2-3-4 apply on master but not on hotfix-7.8.06. Can you submit the patches for hotfix-7.8.06? This is not critical and we can go for master if you want. Let me know. Best, -- Bastien
Re: [O] [patch][babel] ob-lilypond maintenance
Hi Bastien Bastien b...@gnu.org writes: Hi Martyn, Martyn Jago martyn.j...@btinternet.com writes: Maintenance patches: 1) Fix compiler warning 2) Leave versioning to Org 3) Set `no cache' default in audition mode 4) Redirect `homepage' to Worg Thanks a lot. Patch #1 applies correctly on hotfix-7.8.06 and master. #2-3-4 apply on master but not on hotfix-7.8.06. Can you submit the patches for hotfix-7.8.06? This is not critical and we can go for master if you want. Let me know. Best, Here's #1,2,4. #3 Makes no sense in context of code difference between hotfix-7.8.06 against master. Best, Martyn From 2d12de6b60196871303438ca51f9d50e3ae19342 Mon Sep 17 00:00:00 2001 From: Martyn Jago martyn.j...@btinternet.com Date: Wed, 21 Mar 2012 10:49:57 + Subject: [PATCH 1/3] Fix compiler warning. * lisp/ob-lilypond.el: Fix compiler warning. --- lisp/ob-lilypond.el |3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el index 1f412fd..19fe465 100644 --- a/lisp/ob-lilypond.el +++ b/lisp/ob-lilypond.el @@ -30,10 +30,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 '() -- 1.7.3.4 From 78e9de9942947ea47c5983367dfee8c6b67b0f77 Mon Sep 17 00:00:00 2001 From: Martyn Jago martyn.j...@btinternet.com Date: Wed, 21 Mar 2012 10:52:49 + Subject: [PATCH 2/3] Leave versioning to Org. * lisp/ob-lilypond.el: Leave versioning to Org. * testing/lisp/test-ob-lilypond.el: Leave versioning to Org. --- lisp/ob-lilypond.el | 11 +-- testing/lisp/test-ob-lilypond.el | 10 -- 2 files changed, 1 insertions(+), 20 deletions(-) diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el index 19fe465..90a1b60 100644 --- a/lisp/ob-lilypond.el +++ b/lisp/ob-lilypond.el @@ -38,9 +38,6 @@ (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.) - (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 @@ -407,13 +404,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 2ca0597..2c35eca 100644 --- a/testing/lisp/test-ob-lilypond.el +++ b/testing/lisp/test-ob-lilypond.el @@ -43,16 +43,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 0.3 (ly-version))) - (with-temp-buffer -(ly-version t) -(should (equal ob-lilypond version 0.3 - (buffer-substring (point-min) (point-max)) - (ert-deftest ob-lilypond/ly-compile-lilyfile () (should (equal `(,(ly-determine-ly-path);program -- 1.7.3.4 From 71755479fd315167b67875bd647376b48c126085 Mon Sep 17 00:00:00 2001 From: Martyn Jago martyn.j...@btinternet.com Date: Wed, 21 Mar 2012 10:56:52 + Subject: [PATCH 3/3] Re-direct homepage to Worg. * lisp/ob-lilypond.el: Re-direct homepage to Worg. --- lisp/ob-lilypond.el |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el index 90a1b60..6b03bd8 100644 --- a/lisp/ob-lilypond.el +++ b/lisp/ob-lilypond.el @@ -4,7 +4,7 @@ ;; Author: Martyn Jago ;; Keywords: babel language, literate programming -;; Homepage: https://github.com/mjago/ob-lilypond +;; Homepage: http://orgmode.org/worg/org-contrib/babel/languages/ob-doc-lilypond.html ;; This file is part of GNU Emacs. -- 1.7.3.4
Re: [O] [patch][babel] ob-lilypond maintenance
Martyn Jago martyn.j...@btinternet.com writes: Here's #1,2,4. #3 Makes no sense in context of code difference between hotfix-7.8.06 against master. Applied, thanks a bunch. -- Bastien
