Fix regexp for finding code blocks

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 0822f313ac49db77b7d2b88d3c9e307598d9118c..43e4ad30e0609aa3c42ec44eda10a60aba0a22b1 100644 (file)
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-30  Carsten Dominik  <carsten.dominik@gmail.com>
+
+       * ob.el (org-babel-src-block-regexp): If a code block has a body,
+       its last character must be a newline.
+
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
        * org-publish.el (org-publish-index-generate-theindex): rename

diff --git a/lisp/org/ob.el b/lisp/org/ob.el
index 0de0aa661c5958339698b655319fde758f5e2674..44173fdb78940674534d975c3c641c23fd838e82 100644 (file)
--- a/lisp/org/ob.el
+++ b/lisp/org/ob.el
@@ -137,7 +137,7 @@ remove code block execution from the C-c C-c keybinding."
    ;; (4) header arguments
    "\\([^\n]*\\)\n"
    ;; (5) body
-   "\\([^\000]*?\\)[ \t]*#\\+end_src")
+   "\\([^\000]*?\n\\)?[ \t]*#\\+end_src")
   "Regexp used to identify code blocks.")
 
 (defvar org-babel-inline-src-block-regexp