babel: tangle: Respond to changes in generic expansion function

* ob-tangle.el (org-babel-tangle-collect-blocks): Supply
	variable assignment lines to generic expansion command
This commit is contained in:
Dan Davison 2010-10-21 12:39:54 +01:00
parent 83332fb69c
commit a6720e38a3
1 changed files with 6 additions and 4 deletions

View File

@ -287,13 +287,15 @@ code blocks by language."
current-heading block-counter))))
(src-lang (nth 0 info))
(expand-cmd (intern (concat "org-babel-expand-body:" src-lang)))
(assignments-cmd (intern (concat "org-babel-variable-assignments:" src-lang)))
(body ((lambda (body)
(if (assoc :no-expand params)
body
(funcall (if (fboundp expand-cmd)
expand-cmd
'org-babel-expand-body:generic)
body params)))
(if (fboundp expand-cmd) (funcall expand-cmd body params)
(org-babel-expand-body:generic
body params
(and (fboundp assignments-cmd)
(funcall assignments-cmd params))))))
(if (and (cdr (assoc :noweb params))
(let ((nowebs (split-string
(cdr (assoc :noweb params)))))