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

Merge branch 'maint'

Browse source
This commit is contained in:
Nicolas Goaziou 2018-05-04 00:26:37 +02:00
parent 4bd7df57d0 064caac937
commit e8a4f39e73
1 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lisp/ox-html.el
View file

@ -1994,19 +1994,15 @@ communication channel."
(format "<p class=\"creator\">%s</p>\n" creator))
(format "<p class=\"validation\">%s</p>\n"
validation-link))))
(t (format-spec
(or (cadr (assoc-string
(plist-get info :language)
(eval (intern
(format "org-html-%s-format" type)))
t))
(cadr
(assoc-string
"en"
(eval
(intern (format "org-html-%s-format" type)))
t)))
spec))))))
(t
(let ((formats (plist-get info (if (eq type 'preamble)
:html-preamble-format
:html-postamble-format)))
(language (plist-get info :language)))
(format-spec
(cadr (or (assoc-string language formats t)
(assoc-string "en" formats t)))
spec)))))))
(let ((div (assq type (plist-get info :html-divs))))
(when (org-string-nw-p section-contents)
(concat