summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-08-13 15:13:47 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2017-08-13 15:13:47 +0200
commit5f410132b51a48747d5e53156391bf449cc7362b (patch)
tree78d3f26bd0e721b10fe6499fc790d2ed0cc4b3d6
parent3359e05e824d04a801db29ef7cc096d8d2abf557 (diff)
parent5bf7730674b33aad81b834298c2ea68750e41cc5 (diff)
downloadorg-mode-5f410132b51a48747d5e53156391bf449cc7362b.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/ox.el13
1 files changed, 5 insertions, 8 deletions
diff --git a/lisp/ox.el b/lisp/ox.el
index 3b793a0..578960e 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -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