Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2014-07-22 11:55:33 +02:00
commit 02f2d5b42a
1 changed files with 1 additions and 2 deletions

View File

@ -3707,8 +3707,7 @@ element it has to parse."
(goto-char (car affiliated)) (goto-char (car affiliated))
(org-element-keyword-parser limit nil)) (org-element-keyword-parser limit nil))
;; LaTeX Environment. ;; LaTeX Environment.
((looking-at ((looking-at "[ \t]*\\\\begin{\\([A-Za-z0-9]+\\*?\\)}")
"[ \t]*\\\\begin{[A-Za-z0-9*]+}\\(\\[.*?\\]\\|{.*?}\\)*[ \t]*$")
(org-element-latex-environment-parser limit affiliated)) (org-element-latex-environment-parser limit affiliated))
;; Drawer and Property Drawer. ;; Drawer and Property Drawer.
((looking-at org-drawer-regexp) ((looking-at org-drawer-regexp)