0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-07-20 16:56:30 +00:00

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2013-12-16 21:04:57 +01:00
commit b44fbb920c

View file

@ -2909,12 +2909,8 @@ CONTENTS is nil."
Return value is a cons cell whose CAR is `inline-babel-call' and
CDR is beginning position."
(save-excursion
;; Use a simplified version of
;; `org-babel-inline-lob-one-liner-regexp'.
(when (re-search-forward
"call_\\([^()\n]+?\\)\\(?:\\[.*?\\]\\)?([^\n]*?)\\(\\[.*?\\]\\)?"
nil t)
(cons 'inline-babel-call (match-beginning 0)))))
(when (re-search-forward org-babel-inline-lob-one-liner-regexp nil t)
(cons 'inline-babel-call (match-end 1)))))
;;;; Inline Src Block