diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-09-28 23:06:37 +0200 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-09-28 23:06:37 +0200 |
commit | 3c83f1f5acdb7320a60390ecfb3b68e8564d1167 (patch) | |
tree | 872f0249e2441d3b0446bf9be783d4286594c973 | |
parent | b8d89496fda538b2110862cecbd41702110665a6 (diff) | |
parent | c1c5786c8ad8c841cb805a12439cf572c7bbd966 (diff) | |
download | org-mode-3c83f1f5acdb7320a60390ecfb3b68e8564d1167.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/ob-lob.el | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lisp/ob-lob.el b/lisp/ob-lob.el index 8a52b57..13f728f 100644 --- a/lisp/ob-lob.el +++ b/lisp/ob-lob.el @@ -53,11 +53,15 @@ should not be inherited from a source block.") (let* ((info (org-babel-get-src-block-info 'light)) (source-name (nth 4 info))) (when source-name - (setq source-name (intern source-name) - org-babel-library-of-babel - (cons (cons source-name info) - (assq-delete-all source-name org-babel-library-of-babel)) - lob-ingest-count (1+ lob-ingest-count))))) + (setf (nth 1 info) + (if (org-babel-noweb-p (nth 2 info) :eval) + (org-babel-expand-noweb-references info) + (nth 1 info))) + (let ((source (intern source-name))) + (setq org-babel-library-of-babel + (cons (cons source info) + (assq-delete-all source org-babel-library-of-babel)))) + (cl-incf lob-ingest-count)))) (message "%d src block%s added to Library of Babel" lob-ingest-count (if (> lob-ingest-count 1) "s" "")) lob-ingest-count)) |