Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2016-06-14 13:57:23 +02:00
commit 60c11dcb0c
1 changed files with 4 additions and 3 deletions

View File

@ -231,7 +231,8 @@ communication channel."
(if (> (org-export-get-relative-level headline info) 1)
(org-export-data-with-backend headline 'html info)
(unless (org-element-property :footnote-section-p headline)
(let* ((author (and (plist-get info :with-author)
(let* ((email (org-export-data (plist-get info :email) info))
(author (and (plist-get info :with-author)
(let ((auth (plist-get info :author)))
(and auth (org-export-data auth info)))))
(htmlext (plist-get info :html-extension))
@ -275,13 +276,13 @@ communication channel."
"<item>\n"
"<title>%s</title>\n"
"<link>%s</link>\n"
"<author>%s</author>\n"
"<author>%s (%s)</author>\n"
"<guid isPermaLink=\"false\">%s</guid>\n"
"<pubDate>%s</pubDate>\n"
(org-rss-build-categories headline info) "\n"
"<description><![CDATA[%s]]></description>\n"
"</item>\n")
title publink author guid pubdate contents))))))
title publink email author guid pubdate contents))))))
(defun org-rss-build-categories (headline info)
"Build categories for the RSS item."