summaryrefslogtreecommitdiff
path: root/lisp/org/ob.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-08-02 22:05:38 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-08-02 22:05:38 -0700
commit9a70f03d70e44db2ec9c6d2952cb8a1deae15000 (patch)
treec0efd5c0a208640c0a883f4566df1b40caa3aaad /lisp/org/ob.el
parent29c8a348c5c9f326af54a3d30f69cde98fe300bb (diff)
downloademacs-9a70f03d70e44db2ec9c6d2952cb8a1deae15000.tar.gz
Merge from trunk.
Diffstat (limited to 'lisp/org/ob.el')
-rw-r--r--lisp/org/ob.el2
1 files changed, 1 insertions, 1 deletions
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."
;; (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