diff options
author | Eric Schulte <eric.schulte@gmx.com> | 2012-01-24 09:17:08 -0700 |
---|---|---|
committer | Eric Schulte <eric.schulte@gmx.com> | 2012-01-24 09:17:08 -0700 |
commit | afb9860487edc467b56cd3ac481e3eee3032feb6 (patch) | |
tree | 222fcb678ddcbcfffb866f6572dd5abf0a857381 | |
parent | c74fe88c01836f4e8b510f57d68a7f720f685f82 (diff) | |
parent | 1bb2a3c23a49bcb36ab02e5b2cf79909861dbffe (diff) | |
download | org-mode-afb9860487edc467b56cd3ac481e3eee3032feb6.tar.gz |
Merge branch 'origin-maint'
-rw-r--r-- | lisp/ob.el | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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 |