From 05ac8eb8a8858162e096f57f1652dd5df8b0f975 Mon Sep 17 00:00:00 2001 From: Eric Schulte Date: Fri, 25 Jun 2010 10:12:54 -0700 Subject: [PATCH] babel: ensuring each language defined (possibly empty) default header arguments this makes customization easier when users can assume that org-babel-default-header-args:foo will exist for every language --- lisp/babel/langs/ob-C.el | 2 ++ lisp/babel/langs/ob-R.el | 2 ++ lisp/babel/langs/ob-clojure.el | 2 ++ lisp/babel/langs/ob-css.el | 2 ++ lisp/babel/langs/ob-haskell.el | 2 ++ lisp/babel/langs/ob-matlab.el | 2 ++ lisp/babel/langs/ob-ocaml.el | 2 ++ lisp/babel/langs/ob-octave.el | 2 ++ lisp/babel/langs/ob-perl.el | 2 ++ lisp/babel/langs/ob-python.el | 2 ++ lisp/babel/langs/ob-ruby.el | 2 ++ lisp/babel/langs/ob-sass.el | 2 ++ lisp/babel/langs/ob-sh.el | 2 ++ lisp/babel/langs/ob-sql.el | 2 ++ lisp/babel/langs/ob-sqlite.el | 2 ++ 15 files changed, 30 insertions(+) diff --git a/lisp/babel/langs/ob-C.el b/lisp/babel/langs/ob-C.el index 1d61a59ad..42514ead4 100644 --- a/lisp/babel/langs/ob-C.el +++ b/lisp/babel/langs/ob-C.el @@ -36,6 +36,8 @@ (add-to-list 'org-babel-tangle-lang-exts '("c++" . "cpp")) +(defvar org-babel-default-header-args:C '()) + (defvar org-babel-C-compiler "gcc" "Command used to compile a C source code file into an executable.") diff --git a/lisp/babel/langs/ob-R.el b/lisp/babel/langs/ob-R.el index f315cb3ac..a8dba35e1 100644 --- a/lisp/babel/langs/ob-R.el +++ b/lisp/babel/langs/ob-R.el @@ -35,6 +35,8 @@ pagecentre colormodel useDingbats horizontal) "R-specific header arguments.") +(defvar org-babel-default-header-args:R '()) + (defun org-babel-expand-body:R (body params &optional processed-params) "Expand BODY according to PARAMS, return the expanded body." (let* ((processed-params (or processed-params diff --git a/lisp/babel/langs/ob-clojure.el b/lisp/babel/langs/ob-clojure.el index 311e0f095..51f040efa 100644 --- a/lisp/babel/langs/ob-clojure.el +++ b/lisp/babel/langs/ob-clojure.el @@ -45,6 +45,8 @@ (add-to-list 'org-babel-tangle-lang-exts '("clojure" . "clj")) +(defvar org-babel-default-header-args:clojure '()) + (defvar org-babel-clojure-wrapper-method " (defn spit diff --git a/lisp/babel/langs/ob-css.el b/lisp/babel/langs/ob-css.el index cba682b5d..578562292 100644 --- a/lisp/babel/langs/ob-css.el +++ b/lisp/babel/langs/ob-css.el @@ -30,6 +30,8 @@ ;;; Code: (require 'ob) +(defvar org-babel-default-header-args:css '()) + (defun org-babel-expand-body:css (body params &optional processed-params) "Expand BODY according to PARAMS, return the expanded body." body) diff --git a/lisp/babel/langs/ob-haskell.el b/lisp/babel/langs/ob-haskell.el index aed816a06..f364fec7d 100644 --- a/lisp/babel/langs/ob-haskell.el +++ b/lisp/babel/langs/ob-haskell.el @@ -46,6 +46,8 @@ (add-to-list 'org-babel-tangle-lang-exts '("haskell" . "hs")) +(defvar org-babel-default-header-args:haskell '()) + (defvar org-babel-haskell-lhs2tex-command "lhs2tex") (defvar org-babel-haskell-eoe "\"org-babel-haskell-eoe\"") diff --git a/lisp/babel/langs/ob-matlab.el b/lisp/babel/langs/ob-matlab.el index 398217aa9..63858bc92 100644 --- a/lisp/babel/langs/ob-matlab.el +++ b/lisp/babel/langs/ob-matlab.el @@ -39,6 +39,8 @@ (require 'matlab) (require 'ob-octave) +(defvar org-babel-default-header-args:matlab '()) + (defvar org-babel-matlab-shell-command "matlab -nosplash" "Shell command to use to run matlab as an external process.") diff --git a/lisp/babel/langs/ob-ocaml.el b/lisp/babel/langs/ob-ocaml.el index f3eed0592..9bfade32e 100644 --- a/lisp/babel/langs/ob-ocaml.el +++ b/lisp/babel/langs/ob-ocaml.el @@ -41,6 +41,8 @@ (add-to-list 'org-babel-tangle-lang-exts '("ocaml" . "ml")) +(defvar org-babel-default-header-args:ocaml '()) + (defvar org-babel-ocaml-eoe-indicator "\"org-babel-ocaml-eoe\";;") (defvar org-babel-ocaml-eoe-output "org-babel-ocaml-eoe") diff --git a/lisp/babel/langs/ob-octave.el b/lisp/babel/langs/ob-octave.el index a60871187..f1205d075 100644 --- a/lisp/babel/langs/ob-octave.el +++ b/lisp/babel/langs/ob-octave.el @@ -33,6 +33,8 @@ (require 'ob) (require 'octave-inf) +(defvar org-babel-default-header-args:octave '()) + (defvar org-babel-octave-shell-command "octave -q" "Shell command to use to run octave as an external process.") diff --git a/lisp/babel/langs/ob-perl.el b/lisp/babel/langs/ob-perl.el index fc06155a7..0e1f778e1 100644 --- a/lisp/babel/langs/ob-perl.el +++ b/lisp/babel/langs/ob-perl.el @@ -31,6 +31,8 @@ (add-to-list 'org-babel-tangle-lang-exts '("perl" . "pl")) +(defvar org-babel-default-header-args:perl '()) + (defun org-babel-expand-body:perl (body params &optional processed-params) "Expand BODY according to PARAMS, return the expanded body." (let ((vars (second (or processed-params (org-babel-process-params params))))) diff --git a/lisp/babel/langs/ob-python.el b/lisp/babel/langs/ob-python.el index e7ea0d651..5b1fff92b 100644 --- a/lisp/babel/langs/ob-python.el +++ b/lisp/babel/langs/ob-python.el @@ -34,6 +34,8 @@ (add-to-list 'org-babel-tangle-lang-exts '("python" . "py")) +(defvar org-babel-default-header-args:python '()) + (defun org-babel-expand-body:python (body params &optional processed-params) "Expand BODY according to PARAMS, return the expanded body." (concat diff --git a/lisp/babel/langs/ob-ruby.el b/lisp/babel/langs/ob-ruby.el index b42dc7c3b..3dcdd1fe0 100644 --- a/lisp/babel/langs/ob-ruby.el +++ b/lisp/babel/langs/ob-ruby.el @@ -42,6 +42,8 @@ (add-to-list 'org-babel-tangle-lang-exts '("ruby" . "rb")) +(defvar org-babel-default-header-args:ruby '()) + (defun org-babel-expand-body:ruby (body params &optional processed-params) "Expand BODY according to PARAMS, return the expanded body." (let ((vars (second (or processed-params (org-babel-process-params params))))) diff --git a/lisp/babel/langs/ob-sass.el b/lisp/babel/langs/ob-sass.el index 7c06e52c1..7cf7015ef 100644 --- a/lisp/babel/langs/ob-sass.el +++ b/lisp/babel/langs/ob-sass.el @@ -42,6 +42,8 @@ (require 'ob) (require 'sass-mode) +(defvar org-babel-default-header-args:sass '()) + (defun org-babel-expand-body:sass (body params &optional processed-params) "Expand BODY according to PARAMS, return the expanded body." body) diff --git a/lisp/babel/langs/ob-sh.el b/lisp/babel/langs/ob-sh.el index 4b18ad14c..f6c265e0e 100644 --- a/lisp/babel/langs/ob-sh.el +++ b/lisp/babel/langs/ob-sh.el @@ -41,6 +41,8 @@ (declare-function org-babel-comint-with-output "ob-comint" (meta &rest body)) (declare-function orgtbl-to-generic "org-table" (table params)) +(defvar org-babel-default-header-args:sh '()) + (defvar org-babel-sh-command "sh" "Command used to invoke a shell. This will be passed to `shell-command-on-region'") diff --git a/lisp/babel/langs/ob-sql.el b/lisp/babel/langs/ob-sql.el index c680a6bd5..9429ce042 100644 --- a/lisp/babel/langs/ob-sql.el +++ b/lisp/babel/langs/ob-sql.el @@ -45,6 +45,8 @@ ;;; Code: (require 'ob) +(defvar org-babel-default-header-args:sql '()) + (defun org-babel-expand-body:sql (body params &optional processed-params) "Expand BODY according to PARAMS, return the expanded body." body) diff --git a/lisp/babel/langs/ob-sqlite.el b/lisp/babel/langs/ob-sqlite.el index a4f883da6..a8180fce5 100644 --- a/lisp/babel/langs/ob-sqlite.el +++ b/lisp/babel/langs/ob-sqlite.el @@ -29,6 +29,8 @@ ;;; Code: (require 'ob) +(defvar org-babel-default-header-args:sqlite '()) + (defun org-babel-expand-body:sqlite (body params &optional processed-params) body)