diff options
author | Bastien Guerry <bastien1@free.fr> | 2012-04-01 11:49:25 +0200 |
---|---|---|
committer | Bastien Guerry <bastien1@free.fr> | 2012-04-01 11:49:25 +0200 |
commit | 153ae947f845f6d4f31d3d239a1449899c3384f0 (patch) | |
tree | b7ef6c7f4b94f4a4ee19eecd079c36aff84bddc5 /lisp/org/ob-lob.el | |
parent | 42ee526b1adbe2ba7766203980a9d7089aae1a68 (diff) | |
download | emacs-153ae947f845f6d4f31d3d239a1449899c3384f0.tar.gz |
Update to Org version 7.8.07 (commit da0e6f in Org's repo)
Diffstat (limited to 'lisp/org/ob-lob.el')
-rw-r--r-- | lisp/org/ob-lob.el | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/org/ob-lob.el b/lisp/org/ob-lob.el index 8976427ab7e..91ae0751722 100644 --- a/lisp/org/ob-lob.el +++ b/lisp/org/ob-lob.el @@ -65,14 +65,14 @@ To add files to this list use the `org-babel-lob-ingest' command." (defconst org-babel-block-lob-one-liner-regexp (concat - "^\\([ \t]*\\)#\\+call:[ \t]+\\([^\(\)\n]+?\\)\\(\\[\\(.*\\)\\]\\|\\(\\)\\)" - "\(\\([^\n]*\\)\)\\(\\[.+\\]\\|\\)[ \t]*\\(\\([^\n]*\\)\\)?") + "^\\([ \t]*?\\)#\\+call:[ \t]+\\([^\(\)\n]+?\\)\\(\\[\\(.*\\)\\]\\|\\(\\)\\)" + "\(\\([^\n]*?\\)\)\\(\\[.+\\]\\|\\)[ \t]*\\(\\([^\n]*\\)\\)?") "Regexp to match non-inline calls to predefined source block functions.") (defconst org-babel-inline-lob-one-liner-regexp (concat - "\\([^\n]*\\)call_\\([^\(\)\n]+?\\)\\(\\[\\(.*\\)\\]\\|\\(\\)\\)" - "\(\\([^\n]*\\)\)\\(\\[\\(.*?\\)\\]\\)?") + "\\([^\n]*?\\)call_\\([^\(\)\n]+?\\)\\(\\[\\(.*?\\)\\]\\|\\(\\)\\)" + "\(\\([^\n]*?\\)\)\\(\\[\\(.*?\\)\\]\\)?") "Regexp to match inline calls to predefined source block functions.") (defconst org-babel-lob-one-liner-regexp @@ -108,8 +108,8 @@ if so then run the appropriate source block from the Library." (list (format "%s%s(%s)%s" (nonempty 3 12) - (if (not (= 0 (length (nonempty 5 13)))) - (concat "[" (nonempty 5 13) "]") "") + (if (not (= 0 (length (nonempty 5 14)))) + (concat "[" (nonempty 5 14) "]") "") (or (nonempty 7 16) "") (or (nonempty 8 19) "")) (nonempty 9 18))) |