Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2017-09-28 23:06:37 +02:00
commit 3c83f1f5ac
1 changed files with 9 additions and 5 deletions

View File

@ -53,11 +53,15 @@ should not be inherited from a source block.")
(let* ((info (org-babel-get-src-block-info 'light)) (let* ((info (org-babel-get-src-block-info 'light))
(source-name (nth 4 info))) (source-name (nth 4 info)))
(when source-name (when source-name
(setq source-name (intern source-name) (setf (nth 1 info)
org-babel-library-of-babel (if (org-babel-noweb-p (nth 2 info) :eval)
(cons (cons source-name info) (org-babel-expand-noweb-references info)
(assq-delete-all source-name org-babel-library-of-babel)) (nth 1 info)))
lob-ingest-count (1+ lob-ingest-count))))) (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" (message "%d src block%s added to Library of Babel"
lob-ingest-count (if (> lob-ingest-count 1) "s" "")) lob-ingest-count (if (> lob-ingest-count 1) "s" ""))
lob-ingest-count)) lob-ingest-count))