summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2020-02-16 23:33:48 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2020-02-16 23:33:48 +0100
commit427f1a2d03ceb4213934d7defc6e7bd239abe08f (patch)
tree2aa8448d3b8e8e030d3ea19a32d45e0b61a0f33a
parente561bac519a3129166ad5d453ffb2d54e0cf2521 (diff)
parent8f6ce817d80f891108d85606de356806a55ac81c (diff)
downloadorg-mode-427f1a2d03ceb4213934d7defc6e7bd239abe08f.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/ox-html.el11
1 files changed, 3 insertions, 8 deletions
diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index ea6aa63..62043b3 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -1782,13 +1782,8 @@ INFO is a plist used as a communication channel."
(title (if (org-string-nw-p title) title "&lrm;"))
(author (and (plist-get info :with-author)
(let ((auth (plist-get info :author)))
- (and auth
- ;; Return raw Org syntax, skipping non
- ;; exportable objects.
- (org-element-interpret-data
- (org-element-map auth
- (cons 'plain-text org-element-all-objects)
- 'identity info))))))
+ ;; Return raw Org syntax.
+ (and auth (org-element-interpret-data auth)))))
(description (plist-get info :description))
(keywords (plist-get info :keywords))
(charset (or (and org-html-coding-system
@@ -1811,7 +1806,7 @@ INFO is a plist used as a communication channel."
charset) "\n"
(let ((viewport-options
(cl-remove-if-not (lambda (cell) (org-string-nw-p (cadr cell)))
- (plist-get info :html-viewport))))
+ (plist-get info :html-viewport))))
(and viewport-options
(concat
(org-html-close-tag