ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2012-08-25 23:46:18 +02:00
parent 967f20c9a9 11082518ee
commit ab075316b0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/org-element.el
View File

@ -1746,7 +1746,7 @@ Assume point is at the beginning of the paragraph."
;; beginning of an item or a footnote reference. In that ;; beginning of an item or a footnote reference. In that
;; case, we mustn't look for affiliated keywords since they ;; case, we mustn't look for affiliated keywords since they
;; belong to the container. ;; belong to the container.
(inner-par-p (/= (point-at-bol) (point))) (inner-par-p (not (bolp)))
(contents-begin (point)) (contents-begin (point))
(keywords (unless inner-par-p (keywords (unless inner-par-p
(org-element--collect-affiliated-keywords))) (org-element--collect-affiliated-keywords)))
@ -2437,7 +2437,7 @@ its beginning position."
(let (beg) (let (beg)
(when (and (re-search-forward "@@[-A-Za-z0-9]+:" limit t) (when (and (re-search-forward "@@[-A-Za-z0-9]+:" limit t)
(setq beg (match-beginning 0)) (setq beg (match-beginning 0))
(re-search-forward "@@" limit t)) (search-forward "@@" limit t))
(cons 'export-snippet beg))))) (cons 'export-snippet beg)))))
@ -2559,9 +2559,9 @@ Return value is a cons cell whose CAR is `inline-babel-call' and
CDR is beginning position." CDR is beginning position."
(save-excursion (save-excursion
;; Use a simplified version of ;; Use a simplified version of
;; org-babel-inline-lob-one-liner-regexp as regexp for more speed. ;; `org-babel-inline-lob-one-liner-regexp'.
(when (re-search-forward (when (re-search-forward
"\\(?:babel\\|call\\)_\\([^()\n]+?\\)\\(\\[\\(.*\\)\\]\\|\\(\\)\\)(\\([^\n]*\\))\\(\\[\\(.*?\\)\\]\\)?" "call_\\([^()\n]+?\\)\\(?:\\[.*?\\]\\)?([^\n]*?)\\(\\[.*?\\]\\)?"
limit t) limit t)
(cons 'inline-babel-call (match-beginning 0))))) (cons 'inline-babel-call (match-beginning 0)))))