tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'origin-maint'

This commit is contained in:
Eric Schulte 2012-01-24 09:17:08 -07:00
parent c74fe88c01 1bb2a3c23a
commit afb9860487
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ob.el
View File

@ -2162,7 +2162,8 @@ block but are passed literally to the \"example-block\"."
(with-temp-buffer
(insert body) (goto-char (point-min))
(setq index (point))
(while (and (re-search-forward "<<\\(.+?\\)>>" nil t))
(while (and (re-search-forward "<<\\([^ \t].+?[^ \t]\\|[^ \t]\\)>>"
nil t))
(save-match-data (setf source-name (match-string 1)))
(save-match-data (setq evaluate (string-match "\(.*\)" source-name)))
(save-match-data
@ -2227,7 +2228,8 @@ block but are passed literally to the \"example-block\"."
body)))
(setq expansion
(cons sep (cons full expansion)))))))))
(mapconcat #'identity (nreverse (cdr expansion)) ""))
(and expansion
(mapconcat #'identity (nreverse (cdr expansion)) "")))
;; possibly raise an error if named block doesn't exist
(if (member lang org-babel-noweb-error-langs)
(error "%s" (concat