Merge branch 'maint'

lisp/ox.el

@@ -2721,14 +2721,12 @@ from tree."
 		 (cond
 		  ((eq (org-element-type f) 'footnote-definition) f)
 		  ((eq (org-element-property :type f) 'standard) nil)
-		  (t
-		   ;; Since we're only interested in footnote definitions
-		   (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))))))))))
+		  (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))))))))))
     ;; If a select tag is active, also ignore the section before the
     ;; first headline, if any.
     (when selected

testing/lisp/test-ox.el

@@ -2133,6 +2133,15 @@ Para2"
 
 \[fn:2] Very out of scope
 * 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]"
 	(narrow-to-region (point) (point-max))
 	(org-export-as (org-test-default-backend)))))