ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki 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) (headline-label (or (org-element-property :CUSTOM_ID headline)
(concat "sec-" (mapconcat 'number-to-string (concat "sec-" (mapconcat 'number-to-string
headline-number "-")))) headline-number "-"))))
(format-function (cond (format-function
((functionp format-function) format-function) (cond ((functionp format-function) format-function)
((functionp org-html-format-headline-function) ((functionp org-html-format-headline-function)
(function* (lambda (todo todo-type priority text tags &rest ignore)
(lambda (todo todo-type priority text tags (funcall org-html-format-headline-function
&allow-other-keys) todo todo-type priority text tags)))
(funcall org-html-format-headline-function (t 'org-html-format-headline))))
todo todo-type priority text tags))))
(t 'org-html-format-headline))))
(apply format-function (apply format-function
todo todo-type priority text tags todo todo-type priority text tags
:headline-label headline-label :level level :headline-label headline-label :level level