[elpa] externals/org 2e99997 2/2: Merge branch 'bugfix'

[ELPA Syncer]

branch: externals/org
commit 2e99997830c78dbf4df62be22391491fe88337f2
Merge: 7d76961 95ad5a9
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Commit: Nicolas Goaziou <mail@nicolasgoaziou.fr>

    Merge branch 'bugfix'
---
 lisp/oc-csl.el | 3 +--
 lisp/oc.el     | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lisp/oc-csl.el b/lisp/oc-csl.el
index bcd043e..8e0b9a0 100644
--- a/lisp/oc-csl.el
+++ b/lisp/oc-csl.el
@@ -506,8 +506,7 @@ INFO is the export state, as a property list."
     ;; a footnote, but isn't yet.
     (when (and (not footnote) (org-cite-csl--note-style-p info))
       (org-cite-adjust-note citation info)
-      (org-cite-wrap-citation citation info)
-      (setq footnote (org-element-lineage citation '(footnote-reference))))
+      (setq footnote (org-cite-wrap-citation citation info)))
     ;; Return structure.
     (apply #'citeproc-citation-create
            `(:note-index
diff --git a/lisp/oc.el b/lisp/oc.el
index dcda8d7..ca62658 100644
--- a/lisp/oc.el
+++ b/lisp/oc.el
@@ -872,7 +872,9 @@ When non-nil, the return value if the footnote container."
 INFO is the export state, as a property list.
 
 White space before the citation, if any, are removed.  The parse tree is
-modified by side-effect."
+modified by side-effect.
+
+Return newly created footnote object."
   (let ((footnote
          (list 'footnote-reference
                (list :label nil