Merge from master branch

This commit is contained in:
Yujie Wen 2015-02-02 23:14:19 +08:00
parent c3fa10406f
commit 42f58f3cdc
1 changed files with 1 additions and 4 deletions

View File

@ -320,10 +320,7 @@ holding contextual information."
(priority (and (plist-get info :with-priority)
(org-element-property :priority headline)))
;; Create the headline text.
(full-text (funcall (or (plist-get info :html-format-headline-function)
;; nil function, return a suggestive error
(error "Export failed. It seems you are using a stable release of Org-mode. Please use Org-reveal `stable' branch for Org-mode stable releases."))
todo todo-type priority text tags info)))
(full-text (org-html-format-headline--wrap headline info)))
(cond
;; Case 1: This is a footnote section: ignore it.
((org-element-property :footnote-section-p headline) nil)