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

Merge branch 'origin-maint'

This commit is contained in:
Eric Schulte 2012-01-23 19:43:28 -07:00
parent 10b06ae53c 269a509615
commit fce92180d1
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/org.texi
View File

@ -13684,6 +13684,10 @@ inheritance}).}.
#+END_SRC #+END_SRC
@end example @end example
The @code{org-babel-noweb-separator} variable holds the string used to
separate accumulate noweb references like those above. By default this
variable holds a newline.
@node cache, sep, noweb-ref, Specific header arguments @node cache, sep, noweb-ref, Specific header arguments
@subsubsection @code{:cache} @subsubsection @code{:cache}

12
lisp/ob.el
View File

@ -120,6 +120,11 @@ be used."
:group 'org-babel :group 'org-babel
:type 'string) :type 'string)
(defcustom org-babel-noweb-separator "\n"
"String used to separate accumulated noweb references."
:group 'org-babel
:type 'string)
(defvar org-babel-src-name-regexp (defvar org-babel-src-name-regexp
"^[ \t]*#\\+name:[ \t]*" "^[ \t]*#\\+name:[ \t]*"
"Regular expression used to match a source name line.") "Regular expression used to match a source name line.")
@ -2206,7 +2211,7 @@ block but are passed literally to the \"example-block\"."
(c-wrap (cadr cs)))) (c-wrap (cadr cs))))
(org-babel-tangle-comment-links i)) (org-babel-tangle-comment-links i))
body))) body)))
(setq expansion (concat expansion full)))) (setq expansion (cons full expansion))))
(org-babel-map-src-blocks nil (org-babel-map-src-blocks nil
(let ((i (org-babel-get-src-block-info 'light))) (let ((i (org-babel-get-src-block-info 'light)))
(when (equal (or (cdr (assoc :noweb-ref (nth 2 i))) (when (equal (or (cdr (assoc :noweb-ref (nth 2 i)))
@ -2220,8 +2225,9 @@ block but are passed literally to the \"example-block\"."
(c-wrap (cadr cs)))) (c-wrap (cadr cs))))
(org-babel-tangle-comment-links i)) (org-babel-tangle-comment-links i))
body))) body)))
(setq expansion (concat expansion full)))))))) (setq expansion (cons full expansion))))))))
expansion) (mapconcat #'identity (nreverse expansion)
org-babel-noweb-separator))
;; possibly raise an error if named block doesn't exist ;; possibly raise an error if named block doesn't exist
(if (member lang org-babel-noweb-error-langs) (if (member lang org-babel-noweb-error-langs)
(error "%s" (concat (error "%s" (concat