Merge branch 'origin-maint'

Conflicts: lisp/ob.el
2012-01-30 18:33:50 -07:00 · 2012-01-30 18:33:50 -07:00 · 4743d7146a
parent 0c99c8757d 7b59410c30
commit 4743d7146a
1 changed files with 1 additions and 1 deletions
--- a/lisp/ob.el
+++ b/lisp/ob.el
@ -2179,7 +2179,7 @@ block but are passed literally to the \"example-block\"."
        (insert body) (goto-char (point-min))
        (setq index (point))
        (while (and (re-search-forward (org-babel-noweb-wrap
-					"\\([^ \t].+?[^ \t]\\|[^ \t]\\)")
+					"\\([^ \t\n].+?[^ \t]\\|[^ \t\n]\\)")
 				       nil t))
          (save-match-data (setf source-name (match-string 1)))
          (save-match-data (setq evaluate (string-match "\(.*\)" source-name)))