Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2017-08-13 15:13:47 +02:00
commit 5f410132b5
1 changed files with 5 additions and 8 deletions

View File

@ -2743,14 +2743,11 @@ from tree."
(org-element-map data '(footnote-definition footnote-reference)
(lambda (f)
(cond
((eq (org-element-type f) 'footnote-definition) f)
((eq (org-element-property :type f) 'standard) nil)
(t (let ((label (org-element-property :label f)))
(when label ;Skip anonymous references.
(apply
#'org-element-create
'footnote-definition `(:label ,label :post-blank 1)
(org-element-contents f))))))))))
((eq 'footnote-definition (org-element-type f)) f)
((and (eq 'inline (org-element-property :type f))
(org-element-property :label f))
f)
(t nil))))))
;; If a select tag is active, also ignore the section before the
;; first headline, if any.
(when selected