mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2013-07-08 22:27:35 +02:00
parent fdaa996e90 eb37142b14
commit fe8bfb8bd9
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lisp/ox-html.el
View File

@ -2231,15 +2231,13 @@ holding contextual information."
(headline-label (or (org-element-property :CUSTOM_ID headline)
(concat "sec-" (mapconcat 'number-to-string
headline-number "-"))))
(format-function (cond
((functionp format-function) format-function)
((functionp org-html-format-headline-function)
(function*
(lambda (todo todo-type priority text tags
&allow-other-keys)
(funcall org-html-format-headline-function
todo todo-type priority text tags))))
(t 'org-html-format-headline))))
(format-function
(cond ((functionp format-function) format-function)
((functionp org-html-format-headline-function)
(lambda (todo todo-type priority text tags &rest ignore)
(funcall org-html-format-headline-function
todo todo-type priority text tags)))
(t 'org-html-format-headline))))
(apply format-function
todo todo-type priority text tags
:headline-label headline-label :level level