ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ob: Make #+header lines override higher-level settings 

* lisp/ob.el (org-babel-get-src-block-info): Alter order of merge arguments
This commit is contained in:
Dan Davison 2011-01-20 14:19:58 +00:00
parent 43772d2d9a
commit 624141cc68
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/ob.el
View File

@ -179,8 +179,8 @@ Returns a list
(looking-at org-babel-multi-line-header-regexp)) (looking-at org-babel-multi-line-header-regexp))
(setf (nth 2 info) (setf (nth 2 info)
(org-babel-merge-params (org-babel-merge-params
(org-babel-parse-header-arguments (match-string 1)) (nth 2 info)
(nth 2 info)))) (org-babel-parse-header-arguments (match-string 1)))))
(when (looking-at org-babel-src-name-w-name-regexp) (when (looking-at org-babel-src-name-w-name-regexp)
(setq name (org-babel-clean-text-properties (match-string 4))) (setq name (org-babel-clean-text-properties (match-string 4)))
(when (match-string 6) (when (match-string 6)