Browse Source

Using the new org-babel-merge-params function to combine default args with header args provided.

Dan Davison 16 years ago
parent
commit
5cbc2d3803
1 changed files with 3 additions and 3 deletions
  1. 3 3
      lisp/org-babel.el

+ 3 - 3
lisp/org-babel.el

@@ -290,9 +290,9 @@ of the following form.  (language body header-arguments-alist)"
 (defun org-babel-parse-src-block-match ()
   (list (org-babel-clean-text-properties (match-string 1))
         (org-babel-strip-protective-commas (org-babel-clean-text-properties (match-string 4)))
-        (org-combine-plists org-babel-default-header-args
-			    (org-babel-parse-header-arguments
-			     (org-babel-clean-text-properties (or (match-string 3) ""))))))
+        (org-babel-merge-params org-babel-default-header-args
+				(org-babel-parse-header-arguments
+				 (org-babel-clean-text-properties (or (match-string 3) ""))))))
 
 (defun org-babel-parse-inline-src-block-match ()
   (list (org-babel-clean-text-properties (match-string 1))