mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-29 21:37:50 +00:00
Merge branch 'maint'
This commit is contained in:
commit
ac656ad7b9
|
@ -304,13 +304,15 @@ holding export options."
|
||||||
"Return complete document string after HTML conversion.
|
"Return complete document string after HTML conversion.
|
||||||
CONTENTS is the transcoded contents string. INFO is a plist
|
CONTENTS is the transcoded contents string. INFO is a plist
|
||||||
holding export options."
|
holding export options."
|
||||||
(let ((org-html-divs
|
(let ((info (plist-put
|
||||||
(if (equal (plist-get info :html-container) "li")
|
(plist-put
|
||||||
(append '((content "ol" "content")) org-s5--divs)
|
|
||||||
org-s5--divs))
|
|
||||||
(info (plist-put
|
|
||||||
(plist-put info :html-preamble (plist-get info :s5-preamble))
|
(plist-put info :html-preamble (plist-get info :s5-preamble))
|
||||||
:html-postamble (plist-get info :s5-postamble))))
|
:html-postamble
|
||||||
|
(plist-get info :s5-postamble))
|
||||||
|
:html-divs
|
||||||
|
(if (equal "li" (plist-get info :html-container))
|
||||||
|
(cons '(content "ol" "content") org-s5--divs)
|
||||||
|
org-s5--divs))))
|
||||||
(mapconcat
|
(mapconcat
|
||||||
'identity
|
'identity
|
||||||
(list
|
(list
|
||||||
|
|
Loading…
Reference in a new issue