tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2016-04-06 22:28:16 +02:00
parent 716e339c96 9c6811b9d4
commit 4bc07758a5
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lisp/ox-texinfo.el
View File

@ -1097,7 +1097,7 @@ is an integer, build the menu recursively, down to this depth."
(org-export-data (org-export-get-alt-title h info) info)
(org-texinfo--format-entries entries info))
(org-texinfo--build-menu h info (1- level))))))
(org-texinfo--menu-entries scope info) "")))))
(org-texinfo--menu-entries scope info) "\n")))))
(defun org-texinfo--format-entries (entries info)
"Format all direct menu entries in SCOPE, as a string.
@ -1279,9 +1279,11 @@ contextual information."
"Transcode a SECTION element from Org to Texinfo.
CONTENTS holds the contents of the section. INFO is a plist
holding contextual information."
(concat contents
(let ((parent (org-export-get-parent-headline section)))
(and parent (org-texinfo-make-menu parent info)))))
(org-trim
(concat contents
"\n"
(let ((parent (org-export-get-parent-headline section)))
(and parent (org-texinfo-make-menu parent info))))))
;;;; Special Block