Merge branch 'origin-maint'

Conflicts: lisp/ob.el
2012-04-28 18:03:23 -04:00 · 2012-04-28 18:03:23 -04:00 · 4eb4010a97
parent c306dbe388 604a55edd6
commit 4eb4010a97
1 changed files with 1 additions and 1 deletions
--- a/lisp/ob.el
+++ b/lisp/ob.el
@ -1577,7 +1577,7 @@ buffer or nil if no such result exists."
      (catch 'is-a-code-block
 	(when (re-search-forward
 	       (concat org-babel-result-regexp
-		       "[ \t]" (regexp-quote name) "[ \t\n\f\v\r]+") nil t)
+		       "[ \t]" (regexp-quote name) "[ \t]*[\n\f\v\r]") nil t)
 	  (when (and (string= "name" (downcase (match-string 1)))
 		     (or (beginning-of-line 1)
 			 (looking-at org-babel-src-block-regexp)