Sync with Org git commit 374c56b.

[bpt/emacs.git] / lisp / org / org-footnote.el

diff --git a/lisp/org/org-footnote.el b/lisp/org/org-footnote.el
index 9319e08..a9ba8d7 100644 (file)
--- a/lisp/org/org-footnote.el
+++ b/lisp/org/org-footnote.el
@@ -716,8 +716,8 @@ Additional note on `org-footnote-insert-pos-for-preprocessor':
        ((and org-footnote-section (eq major-mode 'org-mode))
        (goto-char (point-min))
        (if (re-search-forward
-             (concat "^\\*[ \t]+" (regexp-quote org-footnote-section)
-                     "[ \t]*$") nil t)
+            (concat "^\\*[ \t]+" (regexp-quote org-footnote-section)
+                    "[ \t]*$") nil t)
            (delete-region (match-beginning 0) (org-end-of-subtree t t)))
        ;; A new footnote section is inserted by default at the end of
        ;; the buffer.
@@ -727,7 +727,14 @@ Additional note on `org-footnote-insert-pos-for-preprocessor':
        (unless (bolp) (newline)))
        ;; No footnote section set: Footnotes will be added at the end
        ;; of the section containing their first reference.
-       ((eq major-mode 'org-mode))
+       ;; Nevertheless, in an export situation, set insertion point to
+       ;; `point-max' by default.
+       ((eq major-mode 'org-mode)
+       (when export-props
+         (goto-char (point-max))
+         (skip-chars-backward " \r\t\n")
+         (forward-line)
+         (delete-region (point) (point-max))))
        (t
        ;; Remove any left-over tag in the buffer, if one is set up.
        (when org-footnote-tag-for-non-org-mode-files