[elpa] externals/org bf98b12 2/2: Merge branch 'maint'

[ELPA Syncer]

branch: externals/org
commit bf98b12d5c087166cefaba0d6f8296de59261419
Merge: 85a25e3 94be20a
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Commit: Nicolas Goaziou <mail@nicolasgoaziou.fr>

    Merge branch 'maint'
---
 lisp/ox-texinfo.el | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lisp/ox-texinfo.el b/lisp/ox-texinfo.el
index eb99334..13430c4 100644
--- a/lisp/ox-texinfo.el
+++ b/lisp/ox-texinfo.el
@@ -899,11 +899,12 @@ holding contextual information."
           (contents
            (concat "\n"
                    (if (org-string-nw-p contents) (concat "\n" contents) "")
-                   (and index (format "\n@printindex %s\n" index)))))
+                   (and index (format "\n@printindex %s\n" index))))
+           (node (org-texinfo--get-node headline info)))
       (if (not command)
          (concat (and (org-export-first-sibling-p headline info)
                       (format "@%s\n" (if numbered? 'enumerate 'itemize)))
-                 "@item\n" full-text "\n"
+                 (format "@item\n@anchor{%s}%s\n" node full-text)
                  contents
                  (if (org-export-last-sibling-p headline info)
                      (format "@end %s" (if numbered? 'enumerate 'itemize))
@@ -911,8 +912,7 @@ holding contextual information."
        (concat
         ;; Even if HEADLINE is using @subheading and al., leave an
         ;; anchor so cross-references in the Org document still work.
-        (format (if notoc? "@anchor{%s}\n" "@node %s\n")
-                (org-texinfo--get-node headline info))
+        (format (if notoc? "@anchor{%s}\n" "@node %s\n") node)
         (format command full-text)
         contents))))))