diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-08-02 22:05:38 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-08-02 22:05:38 -0700 |
| commit | 9a70f03d70e44db2ec9c6d2952cb8a1deae15000 (patch) | |
| tree | c0efd5c0a208640c0a883f4566df1b40caa3aaad /lisp/org | |
| parent | 29c8a348c5c9f326af54a3d30f69cde98fe300bb (diff) | |
| download | emacs-9a70f03d70e44db2ec9c6d2952cb8a1deae15000.tar.gz emacs-9a70f03d70e44db2ec9c6d2952cb8a1deae15000.tar.bz2 emacs-9a70f03d70e44db2ec9c6d2952cb8a1deae15000.zip | |
Merge from trunk.
Diffstat (limited to 'lisp/org')
| -rw-r--r-- | lisp/org/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/org/ob.el | 2 |
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 @@ +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 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 |