aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/org
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/org')
-rw-r--r--lisp/org/ChangeLog5
-rw-r--r--lisp/org/ob.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 0822f313ac4..43e4ad30e06 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,8 @@
12011-07-30 Carsten Dominik <carsten.dominik@gmail.com>
2
3 * ob.el (org-babel-src-block-regexp): If a code block has a body,
4 its last character must be a newline.
5
12011-07-28 Bastien Guerry <bzg@gnu.org> 62011-07-28 Bastien Guerry <bzg@gnu.org>
2 7
3 * org-publish.el (org-publish-index-generate-theindex): rename 8 * org-publish.el (org-publish-index-generate-theindex): rename
diff --git a/lisp/org/ob.el b/lisp/org/ob.el
index 0de0aa661c5..44173fdb789 100644
--- 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."
137 ;; (4) header arguments 137 ;; (4) header arguments
138 "\\([^\n]*\\)\n" 138 "\\([^\n]*\\)\n"
139 ;; (5) body 139 ;; (5) body
140 "\\([^\000]*?\\)[ \t]*#\\+end_src") 140 "\\([^\000]*?\n\\)?[ \t]*#\\+end_src")
141 "Regexp used to identify code blocks.") 141 "Regexp used to identify code blocks.")
142 142
143(defvar org-babel-inline-src-block-regexp 143(defvar org-babel-inline-src-block-regexp