Re: [O] :session question - a simple PATCH

[Andreas Leha]

John Hendy <address@hidden> writes:

[...]

>
> Haven't really been following along, but this works for me (after execution):
>
> #+begin_src emacs-lisp
>       (setq org-babel-default-header-args:R
>             '((:session . "org-R")))
> #+end_src
>
>
> These aren't:
>
> -*- org-babel-default-header-args:R: ((:session . "foo")) -*-
>
> #-*- org-babel-default-header-args:R: ((:session . "foo")) -*-
>
> There were a lot of suggestions made above and I've never used the
> -*-setting-*- syntax and am not searching the right things to find out
> more about how this is supposed to work.
>
> ETA: Ah, I had to re-open the file after adding this to the buffer to
> get it to recognize it:
>
> # Local Variables:
> # org-babel-default-header-args:R: ((:session . "foo"))
> # End:
>
> This produces the same issue as you, Andreas:
>
> Wrong type argument: sequencep, R:
>
>
> Not sure. I'm on 8.0-pre (release_8.0-pre-193-gaa7b1e).
>
>
> John
>


Hi all,

so it seems, currently, I (and John...) can not have both, /file local/
and /language local/ variables.

- The emacs-lisp-block
  #+begin_src emacs-lisp
    (setq org-babel-default-header-args:R
          '((:session . "org-R")))
  #+end_src
  works, of course, but sets the R-session globally.

- The file-local variables (both way to set them) choke on the colon in
  the varible name.



I do not know where to search for the reason, these variables work for
Eric but not for me (and John...).

So attached is a simple patch (search-and-replace) that renames all
org-babel-default-header-args:* variables to
org-babel-default-header-args-*
I do not see any problems with this renaming, but as I have only limited
elisp, that might not mean too much.


This fixes the issue for me at the cost of breaking other people's setup
if they use org-babel-default-header-args:* variants.

What do you think?


Regards,
Andreas


>From 91965d0fc8820f9c0b68728368d3d8062d8c49ef Mon Sep 17 00:00:00 2001
From: Andreas Leha <address@hidden>
Date: Thu, 28 Mar 2013 16:45:33 +0100
Subject: [PATCH] Renamed vars org-babel-default-header-args:* to
 org-babel-default-header-args-*

This makes them usable in file local variables.
---
 contrib/lisp/ob-eukleides.el     |    2 +-
 contrib/lisp/ob-fomus.el         |    2 +-
 contrib/lisp/ob-julia.el         |    2 +-
 contrib/lisp/ob-mathomatic.el    |    2 +-
 contrib/lisp/ob-tcl.el           |    2 +-
 lisp/ob-C.el                     |    2 +-
 lisp/ob-R.el                     |    2 +-
 lisp/ob-asymptote.el             |    2 +-
 lisp/ob-calc.el                  |    2 +-
 lisp/ob-clojure.el               |    2 +-
 lisp/ob-core.el                  |    4 ++--
 lisp/ob-css.el                   |    2 +-
 lisp/ob-ditaa.el                 |    2 +-
 lisp/ob-dot.el                   |    2 +-
 lisp/ob-emacs-lisp.el            |    2 +-
 lisp/ob-exp.el                   |    2 +-
 lisp/ob-fortran.el               |    2 +-
 lisp/ob-gnuplot.el               |    2 +-
 lisp/ob-haskell.el               |    2 +-
 lisp/ob-io.el                    |    2 +-
 lisp/ob-js.el                    |    2 +-
 lisp/ob-latex.el                 |    2 +-
 lisp/ob-ledger.el                |    2 +-
 lisp/ob-lilypond.el              |    6 +++---
 lisp/ob-lisp.el                  |    2 +-
 lisp/ob-makefile.el              |    2 +-
 lisp/ob-maxima.el                |    2 +-
 lisp/ob-mscgen.el                |    2 +-
 lisp/ob-ocaml.el                 |    2 +-
 lisp/ob-octave.el                |    4 ++--
 lisp/ob-org.el                   |    2 +-
 lisp/ob-perl.el                  |    2 +-
 lisp/ob-picolisp.el              |    2 +-
 lisp/ob-plantuml.el              |    2 +-
 lisp/ob-python.el                |    2 +-
 lisp/ob-ruby.el                  |    2 +-
 lisp/ob-sass.el                  |    2 +-
 lisp/ob-scala.el                 |    2 +-
 lisp/ob-scheme.el                |    2 +-
 lisp/ob-screen.el                |    4 ++--
 lisp/ob-sh.el                    |    2 +-
 lisp/ob-shen.el                  |    2 +-
 lisp/ob-sql.el                   |    2 +-
 lisp/ob-sqlite.el                |    2 +-
 testing/lisp/test-ob-lilypond.el |    8 ++++----
 45 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/contrib/lisp/ob-eukleides.el b/contrib/lisp/ob-eukleides.el
index e25ed1c..3747b4e 100644
--- a/contrib/lisp/ob-eukleides.el
+++ b/contrib/lisp/ob-eukleides.el
@@ -37,7 +37,7 @@
 (require 'ob)
 (require 'ob-eval)
 
-(defvar org-babel-default-header-args:eukleides
+(defvar org-babel-default-header-args-eukleides
   '((:results . "file") (:exports . "results"))
   "Default arguments for evaluating a eukleides source block.")
 
diff --git a/contrib/lisp/ob-fomus.el b/contrib/lisp/ob-fomus.el
index 58183fb..8914843 100644
--- a/contrib/lisp/ob-fomus.el
+++ b/contrib/lisp/ob-fomus.el
@@ -42,7 +42,7 @@
 (require 'ob)
 (require 'ob-eval)
 
-(defvar org-babel-default-header-args:fomus
+(defvar org-babel-default-header-args-fomus
   '((:results . "file") (:exports . "results"))
   "Default arguments to use when evaluating a fomus source block.")
 
diff --git a/contrib/lisp/ob-julia.el b/contrib/lisp/ob-julia.el
index 3aed818..61ece8d 100644
--- a/contrib/lisp/ob-julia.el
+++ b/contrib/lisp/ob-julia.el
@@ -51,7 +51,7 @@
 
 (add-to-list 'org-babel-tangle-lang-exts '("julia" . "jl"))
 
-(defvar org-babel-default-header-args:julia '())
+(defvar org-babel-default-header-args-julia '())
 
 (defcustom org-babel-julia-command inferior-julia-program-name
   "Name of command to use for executing julia code."
diff --git a/contrib/lisp/ob-mathomatic.el b/contrib/lisp/ob-mathomatic.el
index 585604e..717d2f0 100644
--- a/contrib/lisp/ob-mathomatic.el
+++ b/contrib/lisp/ob-mathomatic.el
@@ -40,7 +40,7 @@
 (defvar org-babel-tangle-lang-exts)
 (add-to-list 'org-babel-tangle-lang-exts '("mathomatic" . "math"))
 
-(defvar org-babel-default-header-args:mathomatic '())
+(defvar org-babel-default-header-args-mathomatic '())
 
 (defcustom org-babel-mathomatic-command
   (if (boundp 'mathomatic-command) mathomatic-command "mathomatic")
diff --git a/contrib/lisp/ob-tcl.el b/contrib/lisp/ob-tcl.el
index e8d735b..d68b7d9 100644
--- a/contrib/lisp/ob-tcl.el
+++ b/contrib/lisp/ob-tcl.el
@@ -36,7 +36,7 @@
 (defvar org-babel-tangle-lang-exts)
 (add-to-list 'org-babel-tangle-lang-exts '("tcl" . "tcl"))
 
-(defvar org-babel-default-header-args:tcl nil)
+(defvar org-babel-default-header-args-tcl nil)
 
 (defcustom org-babel-tcl-command "tclsh"
 "Name of command to use for executing Tcl code."
diff --git a/lisp/ob-C.el b/lisp/ob-C.el
index b1e8a06..c2aaa1d 100644
--- a/lisp/ob-C.el
+++ b/lisp/ob-C.el
@@ -40,7 +40,7 @@
 (defvar org-babel-tangle-lang-exts)
 (add-to-list 'org-babel-tangle-lang-exts '("C++" . "cpp"))
 
-(defvar org-babel-default-header-args:C '())
+(defvar org-babel-default-header-args-C '())
 
 (defvar org-babel-C-compiler "gcc"
   "Command used to compile a C source code file into an
diff --git a/lisp/ob-R.el b/lisp/ob-R.el
index 9875f81..9c40f68 100644
--- a/lisp/ob-R.el
+++ b/lisp/ob-R.el
@@ -65,7 +65,7 @@
                            (output value graphics))))
   "R-specific header arguments.")
 
-(defvar org-babel-default-header-args:R '())
+(defvar org-babel-default-header-args-R '())
 
 (defcustom org-babel-R-command "R --slave --no-save"
   "Name of command to use for executing R code."
diff --git a/lisp/ob-asymptote.el b/lisp/ob-asymptote.el
index 4ea68df..1cb5625 100644
--- a/lisp/ob-asymptote.el
+++ b/lisp/ob-asymptote.el
@@ -51,7 +51,7 @@
 (defvar org-babel-tangle-lang-exts)
 (add-to-list 'org-babel-tangle-lang-exts '("asymptote" . "asy"))
 
-(defvar org-babel-default-header-args:asymptote
+(defvar org-babel-default-header-args-asymptote
   '((:results . "file") (:exports . "results"))
   "Default arguments when evaluating an Asymptote source block.")
 
diff --git a/lisp/ob-calc.el b/lisp/ob-calc.el
index 766f6ce..803284c 100644
--- a/lisp/ob-calc.el
+++ b/lisp/ob-calc.el
@@ -36,7 +36,7 @@
 (declare-function calc-recall        "calc-store" (&optional var))
 (declare-function math-evaluate-expr "calc-ext"   (x))
 
-(defvar org-babel-default-header-args:calc nil
+(defvar org-babel-default-header-args-calc nil
   "Default arguments for evaluating an calc source block.")
 
 (defun org-babel-expand-body:calc (body params)
diff --git a/lisp/ob-clojure.el b/lisp/ob-clojure.el
index bc2bbc0..deff6d4 100644
--- a/lisp/ob-clojure.el
+++ b/lisp/ob-clojure.el
@@ -44,7 +44,7 @@
 (defvar org-babel-tangle-lang-exts)
 (add-to-list 'org-babel-tangle-lang-exts '("clojure" . "clj"))
 
-(defvar org-babel-default-header-args:clojure '())
+(defvar org-babel-default-header-args-clojure '())
 (defvar org-babel-header-args:clojure '((package . :any)))
 
 (defun org-babel-expand-body:clojure (body params)
diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index a63f77e..4974cfe 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -1292,7 +1292,7 @@ may be specified in the properties of the current outline 
entry."
   "Parse the results from a match of the `org-babel-src-block-regexp'."
   (let* ((block-indentation (length (match-string 1)))
         (lang (org-no-properties (match-string 2)))
-         (lang-headers (intern (concat "org-babel-default-header-args:" lang)))
+         (lang-headers (intern (concat "org-babel-default-header-args-" lang)))
         (switches (match-string 3))
          (body (org-no-properties
                (let* ((body (match-string 5))
@@ -1323,7 +1323,7 @@ may be specified in the properties of the current outline 
entry."
 (defun org-babel-parse-inline-src-block-match ()
   "Parse the results from a match of the `org-babel-inline-src-block-regexp'."
   (let* ((lang (org-no-properties (match-string 2)))
-         (lang-headers (intern (concat "org-babel-default-header-args:" 
lang))))
+         (lang-headers (intern (concat "org-babel-default-header-args-" 
lang))))
     (list lang
           (org-unescape-code-in-string (org-no-properties (match-string 5)))
           (org-babel-merge-params
diff --git a/lisp/ob-css.el b/lisp/ob-css.el
index a1205f5..b6bc5c0 100644
--- a/lisp/ob-css.el
+++ b/lisp/ob-css.el
@@ -29,7 +29,7 @@
 ;;; Code:
 (require 'ob)
 
-(defvar org-babel-default-header-args:css '())
+(defvar org-babel-default-header-args-css '())
 
 (defun org-babel-execute:css (body params)
   "Execute a block of CSS code.
diff --git a/lisp/ob-ditaa.el b/lisp/ob-ditaa.el
index d3d76e5..bc8d979 100644
--- a/lisp/ob-ditaa.el
+++ b/lisp/ob-ditaa.el
@@ -39,7 +39,7 @@
 (require 'ob)
 (require 'org-compat)
 
-(defvar org-babel-default-header-args:ditaa
+(defvar org-babel-default-header-args-ditaa
   '((:results . "file")
     (:exports . "results")
     (:java . "-Dfile.encoding=UTF-8"))
diff --git a/lisp/ob-dot.el b/lisp/ob-dot.el
index 7504264..90dbfa2 100644
--- a/lisp/ob-dot.el
+++ b/lisp/ob-dot.el
@@ -40,7 +40,7 @@
 ;;; Code:
 (require 'ob)
 
-(defvar org-babel-default-header-args:dot
+(defvar org-babel-default-header-args-dot
   '((:results . "file") (:exports . "results"))
   "Default arguments to use when evaluating a dot source block.")
 
diff --git a/lisp/ob-emacs-lisp.el b/lisp/ob-emacs-lisp.el
index 886645d..df2c78e 100644
--- a/lisp/ob-emacs-lisp.el
+++ b/lisp/ob-emacs-lisp.el
@@ -28,7 +28,7 @@
 ;;; Code:
 (require 'ob)
 
-(defvar org-babel-default-header-args:emacs-lisp
+(defvar org-babel-default-header-args-emacs-lisp
   '((:hlines . "yes") (:colnames . "no"))
   "Default arguments for evaluating an emacs-lisp source block.")
 
diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el
index 0d98690..6823c55 100644
--- a/lisp/ob-exp.el
+++ b/lisp/ob-exp.el
@@ -68,7 +68,7 @@ process."
 
 (defmacro org-babel-exp-in-export-file (lang &rest body)
   (declare (indent 1))
-  `(let* ((lang-headers (intern (concat "org-babel-default-header-args:" 
,lang)))
+  `(let* ((lang-headers (intern (concat "org-babel-default-header-args-" 
,lang)))
          (heading (nth 4 (ignore-errors (org-heading-components))))
          (export-buffer (current-buffer))
          (original-buffer (org-babel-exp-get-export-buffer)) results)
diff --git a/lisp/ob-fortran.el b/lisp/ob-fortran.el
index 1eab03e..a1b06c8 100644
--- a/lisp/ob-fortran.el
+++ b/lisp/ob-fortran.el
@@ -36,7 +36,7 @@
 (defvar org-babel-tangle-lang-exts)
 (add-to-list 'org-babel-tangle-lang-exts '("fortran" . "F90"))
 
-(defvar org-babel-default-header-args:fortran '())
+(defvar org-babel-default-header-args-fortran '())
 
 (defvar org-babel-fortran-compiler "gfortran"
   "fortran command used to compile a fortran source code file into an
diff --git a/lisp/ob-gnuplot.el b/lisp/ob-gnuplot.el
index 4b3a1c6..e0a6330 100644
--- a/lisp/ob-gnuplot.el
+++ b/lisp/ob-gnuplot.el
@@ -48,7 +48,7 @@
 (declare-function gnuplot-send-string-to-gnuplot "ext:gnuplot-mode" (str txt))
 (declare-function gnuplot-send-buffer-to-gnuplot "ext:gnuplot-mode" ())
 
-(defvar org-babel-default-header-args:gnuplot
+(defvar org-babel-default-header-args-gnuplot
   '((:results . "file") (:exports . "results") (:session . nil))
   "Default arguments to use when evaluating a gnuplot source block.")
 
diff --git a/lisp/ob-haskell.el b/lisp/ob-haskell.el
index a04963f..9ac3fe9 100644
--- a/lisp/ob-haskell.el
+++ b/lisp/ob-haskell.el
@@ -52,7 +52,7 @@
 (defvar org-babel-tangle-lang-exts)
 (add-to-list 'org-babel-tangle-lang-exts '("haskell" . "hs"))
 
-(defvar org-babel-default-header-args:haskell '())
+(defvar org-babel-default-header-args-haskell '())
 
 (defvar org-babel-haskell-lhs2tex-command "lhs2tex")
 
diff --git a/lisp/ob-io.el b/lisp/ob-io.el
index af18f74..d10bf55 100644
--- a/lisp/ob-io.el
+++ b/lisp/ob-io.el
@@ -37,7 +37,7 @@
 
 (defvar org-babel-tangle-lang-exts) ;; Autoloaded
 (add-to-list 'org-babel-tangle-lang-exts '("io" . "io"))
-(defvar org-babel-default-header-args:io '())
+(defvar org-babel-default-header-args-io '())
 (defvar org-babel-io-command "io"
   "Name of the command to use for executing Io code.")
 
diff --git a/lisp/ob-js.el b/lisp/ob-js.el
index 8cae35b..0b1cba3 100644
--- a/lisp/ob-js.el
+++ b/lisp/ob-js.el
@@ -43,7 +43,7 @@
 
 (declare-function run-mozilla "ext:moz" (arg))
 
-(defvar org-babel-default-header-args:js '()
+(defvar org-babel-default-header-args-js '()
   "Default header arguments for js code blocks.")
 
 (defvar org-babel-js-eoe "org-babel-js-eoe"
diff --git a/lisp/ob-latex.el b/lisp/ob-latex.el
index 94d5133..3d2ce92 100644
--- a/lisp/ob-latex.el
+++ b/lisp/ob-latex.el
@@ -46,7 +46,7 @@
 (defvar org-latex-default-packages-alist) ; From org.el
 (defvar org-latex-packages-alist)        ; From org.el
 
-(defvar org-babel-default-header-args:latex
+(defvar org-babel-default-header-args-latex
   '((:results . "latex") (:exports . "results"))
   "Default arguments to use when evaluating a LaTeX source block.")
 
diff --git a/lisp/ob-ledger.el b/lisp/ob-ledger.el
index 17911cc..c9fab4a 100644
--- a/lisp/ob-ledger.el
+++ b/lisp/ob-ledger.el
@@ -38,7 +38,7 @@
 ;;; Code:
 (require 'ob)
 
-(defvar org-babel-default-header-args:ledger
+(defvar org-babel-default-header-args-ledger
   '((:results . "output") (:cmdline . "bal"))
   "Default arguments to use when evaluating a ledger source block.")
 
diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el
index 6080a5a..acd2313 100644
--- a/lisp/ob-lilypond.el
+++ b/lisp/ob-lilypond.el
@@ -36,7 +36,7 @@
 
 (add-to-list 'org-babel-tangle-lang-exts '("LilyPond" . "ly"))
 
-(defvar org-babel-default-header-args:lilypond '()
+(defvar org-babel-default-header-args-lilypond '()
   "Default header arguments for lilypond code blocks.
 NOTE: The arguments are determined at lilypond compile time.
 See (ly-set-header-args)")
@@ -427,9 +427,9 @@ mode i.e.  ARRANGE-MODE is t"
            (:exports . "results")))))
 
 (defun ly-set-header-args (mode)
-  "Set org-babel-default-header-args:lilypond
+  "Set org-babel-default-header-args-lilypond
 dependent on LY-ARRANGE-MODE"
-  (setq org-babel-default-header-args:lilypond
+  (setq org-babel-default-header-args-lilypond
         (ly-get-header-args mode)))
 
 (provide 'ob-lilypond)
diff --git a/lisp/ob-lisp.el b/lisp/ob-lisp.el
index 2bb1a25..0433c34 100644
--- a/lisp/ob-lisp.el
+++ b/lisp/ob-lisp.el
@@ -40,7 +40,7 @@
 (defvar org-babel-tangle-lang-exts)
 (add-to-list 'org-babel-tangle-lang-exts '("lisp" . "lisp"))
 
-(defvar org-babel-default-header-args:lisp '())
+(defvar org-babel-default-header-args-lisp '())
 (defvar org-babel-header-args:lisp '((package . :any)))
 
 (defcustom org-babel-lisp-dir-fmt
diff --git a/lisp/ob-makefile.el b/lisp/ob-makefile.el
index 7b0ff93..016651c 100644
--- a/lisp/ob-makefile.el
+++ b/lisp/ob-makefile.el
@@ -28,7 +28,7 @@
 ;;; Code:
 (require 'ob)
 
-(defvar org-babel-default-header-args:makefile '())
+(defvar org-babel-default-header-args-makefile '())
 
 (defun org-babel-execute:makefile (body params)
   "Execute a block of makefile code.
diff --git a/lisp/ob-maxima.el b/lisp/ob-maxima.el
index 916dd7e..6936dd0 100644
--- a/lisp/ob-maxima.el
+++ b/lisp/ob-maxima.el
@@ -38,7 +38,7 @@
 (defvar org-babel-tangle-lang-exts)
 (add-to-list 'org-babel-tangle-lang-exts '("maxima" . "max"))
 
-(defvar org-babel-default-header-args:maxima '())
+(defvar org-babel-default-header-args-maxima '())
 
 (defcustom org-babel-maxima-command
   (if (boundp 'maxima-command) maxima-command "maxima")
diff --git a/lisp/ob-mscgen.el b/lisp/ob-mscgen.el
index 209ad7d..0c56071 100644
--- a/lisp/ob-mscgen.el
+++ b/lisp/ob-mscgen.el
@@ -56,7 +56,7 @@
 ;;; Code:
 (require 'ob)
 
-(defvar org-babel-default-header-args:mscgen
+(defvar org-babel-default-header-args-mscgen
   '((:results . "file") (:exports . "results"))
   "Default arguments to use when evaluating a mscgen source block.")
 
diff --git a/lisp/ob-ocaml.el b/lisp/ob-ocaml.el
index 9390fab..5919c42 100644
--- a/lisp/ob-ocaml.el
+++ b/lisp/ob-ocaml.el
@@ -46,7 +46,7 @@
 (defvar org-babel-tangle-lang-exts)
 (add-to-list 'org-babel-tangle-lang-exts '("ocaml" . "ml"))
 
-(defvar org-babel-default-header-args:ocaml '())
+(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/ob-octave.el b/lisp/ob-octave.el
index c2a3abb..77e68a8 100644
--- a/lisp/ob-octave.el
+++ b/lisp/ob-octave.el
@@ -35,8 +35,8 @@
 (declare-function matlab-shell "ext:matlab-mode")
 (declare-function matlab-shell-run-region "ext:matlab-mode")
 
-(defvar org-babel-default-header-args:matlab '())
-(defvar org-babel-default-header-args:octave '())
+(defvar org-babel-default-header-args-matlab '())
+(defvar org-babel-default-header-args-octave '())
 
 (defvar org-babel-matlab-shell-command "matlab -nosplash"
   "Shell command to run matlab as an external process.")
diff --git a/lisp/ob-org.el b/lisp/ob-org.el
index 18cce3b..eecf802 100644
--- a/lisp/ob-org.el
+++ b/lisp/ob-org.el
@@ -32,7 +32,7 @@
 (declare-function org-export-string-as "ox"
                  (string backend &optional body-only ext-plist))
 
-(defvar org-babel-default-header-args:org
+(defvar org-babel-default-header-args-org
   '((:results . "raw silent") (:exports . "code"))
   "Default arguments for evaluating a org source block.")
 
diff --git a/lisp/ob-perl.el b/lisp/ob-perl.el
index 117782f..4e38319 100644
--- a/lisp/ob-perl.el
+++ b/lisp/ob-perl.el
@@ -33,7 +33,7 @@
 (defvar org-babel-tangle-lang-exts)
 (add-to-list 'org-babel-tangle-lang-exts '("perl" . "pl"))
 
-(defvar org-babel-default-header-args:perl '())
+(defvar org-babel-default-header-args-perl '())
 
 (defvar org-babel-perl-command "perl"
   "Name of command to use for executing perl code.")
diff --git a/lisp/ob-picolisp.el b/lisp/ob-picolisp.el
index e785366..99fb254 100644
--- a/lisp/ob-picolisp.el
+++ b/lisp/ob-picolisp.el
@@ -65,7 +65,7 @@
 
 ;;; interferes with settings in org-babel buffer?
 ;; optionally declare default header arguments for this language
-;; (defvar org-babel-default-header-args:picolisp
+;; (defvar org-babel-default-header-args-picolisp
 ;;   '((:colnames . "no"))
 ;;   "Default arguments for evaluating a picolisp source block.")
 
diff --git a/lisp/ob-plantuml.el b/lisp/ob-plantuml.el
index c17d444..0046d3b 100644
--- a/lisp/ob-plantuml.el
+++ b/lisp/ob-plantuml.el
@@ -36,7 +36,7 @@
 ;;; Code:
 (require 'ob)
 
-(defvar org-babel-default-header-args:plantuml
+(defvar org-babel-default-header-args-plantuml
   '((:results . "file") (:exports . "results"))
   "Default arguments for evaluating a plantuml source block.")
 
diff --git a/lisp/ob-python.el b/lisp/ob-python.el
index 7bc9a1f..195c6ab 100644
--- a/lisp/ob-python.el
+++ b/lisp/ob-python.el
@@ -38,7 +38,7 @@
 (defvar org-babel-tangle-lang-exts)
 (add-to-list 'org-babel-tangle-lang-exts '("python" . "py"))
 
-(defvar org-babel-default-header-args:python '())
+(defvar org-babel-default-header-args-python '())
 
 (defcustom org-babel-python-command "python"
   "Name of the command for executing Python code."
diff --git a/lisp/ob-ruby.el b/lisp/ob-ruby.el
index bef8fba..b0a040c 100644
--- a/lisp/ob-ruby.el
+++ b/lisp/ob-ruby.el
@@ -45,7 +45,7 @@
 (defvar org-babel-tangle-lang-exts)
 (add-to-list 'org-babel-tangle-lang-exts '("ruby" . "rb"))
 
-(defvar org-babel-default-header-args:ruby '())
+(defvar org-babel-default-header-args-ruby '())
 
 (defvar org-babel-ruby-command "ruby"
   "Name of command to use for executing ruby code.")
diff --git a/lisp/ob-sass.el b/lisp/ob-sass.el
index cdb75be..d9ee093 100644
--- a/lisp/ob-sass.el
+++ b/lisp/ob-sass.el
@@ -40,7 +40,7 @@
 ;;; Code:
 (require 'ob)
 
-(defvar org-babel-default-header-args:sass '())
+(defvar org-babel-default-header-args-sass '())
 
 (defun org-babel-execute:sass (body params)
   "Execute a block of Sass code with Babel.
diff --git a/lisp/ob-scala.el b/lisp/ob-scala.el
index 7cb3099..5f34401 100644
--- a/lisp/ob-scala.el
+++ b/lisp/ob-scala.el
@@ -35,7 +35,7 @@
 
 (defvar org-babel-tangle-lang-exts) ;; Autoloaded
 (add-to-list 'org-babel-tangle-lang-exts '("scala" . "scala"))
-(defvar org-babel-default-header-args:scala '())
+(defvar org-babel-default-header-args-scala '())
 (defvar org-babel-scala-command "scala"
   "Name of the command to use for executing Scala code.")
 
diff --git a/lisp/ob-scheme.el b/lisp/ob-scheme.el
index c9fa44a..c37af38 100644
--- a/lisp/ob-scheme.el
+++ b/lisp/ob-scheme.el
@@ -42,7 +42,7 @@
 
 (declare-function run-scheme "ext:cmuscheme" (cmd))
 
-(defvar org-babel-default-header-args:scheme '()
+(defvar org-babel-default-header-args-scheme '()
   "Default header arguments for scheme code blocks.")
 
 (defvar org-babel-scheme-eoe "org-babel-scheme-eoe"
diff --git a/lisp/ob-screen.el b/lisp/ob-screen.el
index f263376..f57924b 100644
--- a/lisp/ob-screen.el
+++ b/lisp/ob-screen.el
@@ -39,7 +39,7 @@
   "The command location for screen.
 In case you want to use a different screen than one selected by your $PATH")
 
-(defvar org-babel-default-header-args:screen
+(defvar org-babel-default-header-args-screen
   '((:results . "silent") (:session . "default") (:cmd . "sh") (:terminal . 
"xterm"))
   "Default arguments to use when running screen source blocks.")
 
@@ -124,7 +124,7 @@ The terminal should shortly flicker."
          (tmpfile "/tmp/org-babel-screen.test")
          (body (concat "echo '" random-string "' > " tmpfile "\nexit\n"))
          process tmp-string)
-    (org-babel-execute:screen body org-babel-default-header-args:screen)
+    (org-babel-execute:screen body org-babel-default-header-args-screen)
     ;; XXX: need to find a better way to do the following
     (while (not (file-readable-p tmpfile))
       ;; do something, otherwise this will be optimized away
diff --git a/lisp/ob-sh.el b/lisp/ob-sh.el
index f11b799..39f5e30 100644
--- a/lisp/ob-sh.el
+++ b/lisp/ob-sh.el
@@ -36,7 +36,7 @@
 (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-default-header-args-sh '())
 
 (defvar org-babel-sh-command "sh"
   "Command used to invoke a shell.
diff --git a/lisp/ob-shen.el b/lisp/ob-shen.el
index a41580f..61a4ea6 100644
--- a/lisp/ob-shen.el
+++ b/lisp/ob-shen.el
@@ -37,7 +37,7 @@
 
 (declare-function shen-eval-defun "ext:inf-shen" (&optional and-go))
 
-(defvar org-babel-default-header-args:shen '()
+(defvar org-babel-default-header-args-shen '()
   "Default header arguments for shen code blocks.")
 
 (defun org-babel-expand-body:shen (body params)
diff --git a/lisp/ob-sql.el b/lisp/ob-sql.el
index 658a54f..7b59aaa 100644
--- a/lisp/ob-sql.el
+++ b/lisp/ob-sql.el
@@ -62,7 +62,7 @@
 (declare-function orgtbl-to-csv "org-table" (table params))
 (declare-function org-table-to-lisp "org-table" (&optional txt))
 
-(defvar org-babel-default-header-args:sql '())
+(defvar org-babel-default-header-args-sql '())
 
 (defconst org-babel-header-args:sql
   '((engine           . :any)
diff --git a/lisp/ob-sqlite.el b/lisp/ob-sqlite.el
index 84d4688..9008bd9 100644
--- a/lisp/ob-sqlite.el
+++ b/lisp/ob-sqlite.el
@@ -34,7 +34,7 @@
 (declare-function orgtbl-to-csv "org-table" (table params))
 (declare-function org-table-to-lisp "org-table" (&optional txt))
 
-(defvar org-babel-default-header-args:sqlite '())
+(defvar org-babel-default-header-args-sqlite '())
 
 (defvar org-babel-header-args:sqlite
   '((db        . :any)
diff --git a/testing/lisp/test-ob-lilypond.el b/testing/lisp/test-ob-lilypond.el
index 4a155a8..2f48198 100644
--- a/testing/lisp/test-ob-lilypond.el
+++ b/testing/lisp/test-ob-lilypond.el
@@ -128,12 +128,12 @@
 (ert-deftest ob-lilypond/ly-arrange-mode ()
   (should (boundp 'ly-arrange-mode)))
 
-;; (ert-deftest ob-lilypond/org-babel-default-header-args:lilypond ()
+;; (ert-deftest ob-lilypond/org-babel-default-header-args-lilypond ()
 ;;   (should (equal  '((:tangle . "yes")
 ;;                     (:noweb . "yes")
 ;;                     (:results . "silent")
 ;;                     (:comments . "yes"))
-;;                   org-babel-default-header-args:lilypond)))
+;;                   org-babel-default-header-args-lilypond)))
 
 ;;TODO finish...
 (ert-deftest ob-lilypond/org-babel-expand-body:lilypond ()
@@ -380,11 +380,11 @@
                    (:results . "silent")
                    (:cache . "yes")
                    (:comments . "yes"))
-                 org-babel-default-header-args:lilypond))
+                 org-babel-default-header-args-lilypond))
   (ly-set-header-args nil)
   (should (equal '((:results . "file")
                    (:exports . "results"))
-                 org-babel-default-header-args:lilypond)))
+                 org-babel-default-header-args-lilypond)))
 
 (provide 'test-ob-lilypond)
 
-- 
1.7.10.4