diff options
author | Bastien Guerry <bzg@altern.org> | 2014-03-15 05:10:16 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2014-03-15 05:10:16 +0100 |
commit | 817ea65a6761b115216be154f1b79acd38df0449 (patch) | |
tree | 0f3a65fdbf2d98e3132cc825079dbc6561feab60 | |
parent | e0c723573b243ccd36663ee3fe0e594abef9a90d (diff) | |
parent | 8012443bc8ee054b579314dab30fa7b4f4e12016 (diff) | |
download | org-mode-817ea65a6761b115216be154f1b79acd38df0449.tar.gz |
Merge branch 'master' of orgmode.org:org-mode
-rw-r--r-- | lisp/org-element.el | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lisp/org-element.el b/lisp/org-element.el index 27e9bda..467616e 100644 --- a/lisp/org-element.el +++ b/lisp/org-element.el @@ -1284,10 +1284,9 @@ CONTENTS is the contents of the element." (throw 'exit (sort struct 'car-less-than-car)))))) ;; Skip blocks (any type) and drawers contents. (cond - ((and (looking-at "\\(?:[ \t]*\\)?#\\+BEGIN\\(:\\|_\\S-+\\)") + ((and (looking-at "#\\+BEGIN\\(:\\|_\\S-+\\)") (re-search-forward - (format "^[ \t]*#\\+END%s[ \t]*$" - (org-match-string-no-properties 1)) + (format "^[ \t]*#\\+END%s[ \t]*$" (match-string 1)) limit t))) ((and (looking-at org-drawer-regexp) (re-search-forward "^[ \t]*:END:[ \t]*$" limit t)))) @@ -2881,8 +2880,12 @@ CONTENTS is nil." Return value is a cons cell whose CAR is `inline-babel-call' and CDR is beginning position." (save-excursion - (when (re-search-forward org-babel-inline-lob-one-liner-regexp nil t) - (cons 'inline-babel-call (match-end 1))))) + (catch 'exit + (while (search-forward "call_" nil t) + (save-excursion + (goto-char (match-beginning 0)) + (when (looking-at org-babel-inline-lob-one-liner-regexp) + (throw 'exit (cons 'inline-babel-call (point))))))))) ;;;; Inline Src Block |