diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2018-05-04 00:26:37 +0200 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2018-05-04 00:26:37 +0200 |
| commit | e8a4f39e7305b2a2aeff132adec1fe02fd5a31d3 (patch) | |
| tree | f39f800c5230f79a553d41fb435330901de4ed34 | |
| parent | 4bd7df57d0b970468dcd86afa2b907c9cc508fc7 (diff) | |
| parent | 064caac937acdf3f7993ff459feffaba7bef7d7d (diff) | |
| download | org-mode-e8a4f39e7305b2a2aeff132adec1fe02fd5a31d3.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/ox-html.el | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/lisp/ox-html.el b/lisp/ox-html.el index e32083c..41b0aa3 100644 --- a/lisp/ox-html.el +++ b/lisp/ox-html.el @@ -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 |