Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2013-11-03 17:53:11 +01:00
commit b96986b81c
2 changed files with 8 additions and 2 deletions

View File

@ -5218,9 +5218,10 @@ Providing it allows for quicker computation."
((let ((post (org-element-property :post-affiliated element)))
(and post (< origin post)))
(beginning-of-line)
(looking-at org-element--affiliated-re)
(let ((case-fold-search t)) (looking-at org-element--affiliated-re))
(cond
((not (member (upcase (match-string 1)) org-element-parsed-keywords))
((not (member-ignore-case (match-string 1)
org-element-parsed-keywords))
(throw 'objects-forbidden element))
((< (match-end 0) origin)
(narrow-to-region (match-end 0) (line-end-position)))

View File

@ -2859,6 +2859,11 @@ Paragraph \\alpha."
(org-test-with-temp-text "#+CAPTION: {{{macro}}}\n| a | b |."
(progn (search-forward "{")
(org-element-type (org-element-context))))))
(should
(eq 'bold
(org-test-with-temp-text "#+caption: *bold*\nParagraph"
(progn (search-forward "*")
(org-element-type (org-element-context))))))
;; Correctly set `:parent' property.
(should
(eq 'paragraph