summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Davison <davison@stats.ox.ac.uk>2010-10-21 12:39:54 +0100
committerDan Davison <davison@stats.ox.ac.uk>2010-10-21 13:06:01 +0100
commita6720e38a35f9c8904fc19296c7b1a2fe438e720 (patch)
treeb2d0a1235a3b7be6748a7a97244236d13bd7343f
parent83332fb69cd5291aaffba5b24565f0770fce1b37 (diff)
downloadorg-mode-a6720e38a35f9c8904fc19296c7b1a2fe438e720.tar.gz
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
-rw-r--r--lisp/ob-tangle.el10
1 files changed, 6 insertions, 4 deletions
diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el
index eb37600..f07a3b8 100644
--- a/lisp/ob-tangle.el
+++ b/lisp/ob-tangle.el
@@ -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)))))