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 2016-06-28 00:31:09 +02:00
parent 8285ff4cf2 07de65e1ea
commit f0ff257fa7
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lisp/ox.el
View File

@ -2721,14 +2721,12 @@ from tree."
(cond (cond
((eq (org-element-type f) 'footnote-definition) f) ((eq (org-element-type f) 'footnote-definition) f)
((eq (org-element-property :type f) 'standard) nil) ((eq (org-element-property :type f) 'standard) nil)
(t (t (let ((label (org-element-property :label f)))
;; Since we're only interested in footnote definitions (when label ;Skip anonymous references.
(let ((label (org-element-property :label f))) (apply
(when label ;Skip anonymous references. #'org-element-create
(apply 'footnote-definition `(:label ,label :post-blank 1)
#'org-element-create (org-element-contents f))))))))))
'footnote-definition `(:label ,label :post-blank 1)
(org-element-contents f))))))))))
;; If a select tag is active, also ignore the section before the ;; If a select tag is active, also ignore the section before the
;; first headline, if any. ;; first headline, if any.
(when selected (when selected

9
testing/lisp/test-ox.el
View File

@ -2133,6 +2133,15 @@ Para2"
\[fn:2] Very out of scope \[fn:2] Very out of scope
* Title * Title
<point>Paragraph[fn:1]"
(narrow-to-region (point) (point-max))
(org-export-as (org-test-default-backend)))))
(should
(string-match
"D2"
(org-test-with-temp-text "
\[fn:1] Out of scope[fn:2:D2]
* Title
<point>Paragraph[fn:1]" <point>Paragraph[fn:1]"
(narrow-to-region (point) (point-max)) (narrow-to-region (point) (point-max))
(org-export-as (org-test-default-backend))))) (org-export-as (org-test-default-backend)))))