1
0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-22 07:09:47 +00:00

ox-html.el and ox-org.el: Use the custom HTML extension.

* ox-org.el (org-org-publish-to-org):
* ox-html.el (org-html-publish-to-html): Use the custom
extension.

Thanks to Ian Barton for reporting this.
This commit is contained in:
Bastien Guerry 2013-04-03 13:25:11 +02:00
parent 69eb39a4a9
commit a597a8b622
2 changed files with 7 additions and 2 deletions

View File

@ -3248,7 +3248,10 @@ is the property list for the given project. PUB-DIR is the
publishing directory.
Return output file name."
(org-publish-org-to 'html filename ".html" plist pub-dir))
(org-publish-org-to 'html filename
(concat "." (or (plist-get plist :html-extension)
org-html-extension "html"))
plist pub-dir))
;;; FIXME

View File

@ -146,6 +146,8 @@ Return output file name."
(require 'ox-html)
(let* ((org-inhibit-startup t)
(htmlize-output-type 'css)
(html-ext (concat "." (or (plist-get plist :html-extension)
org-html-extension "html")))
(visitingp (find-buffer-visiting filename))
(work-buffer (or visitingp (find-file filename)))
newbuf)
@ -160,7 +162,7 @@ Return output file name."
(format
"<link rel=\"stylesheet\" type=\"text/css\" href=\"%s\">"
org-org-htmlized-css-url) t t)))
(write-file (concat pub-dir (file-name-nondirectory filename) ".html")))
(write-file (concat pub-dir (file-name-nondirectory filename) html-ext)))
(kill-buffer newbuf)
(unless visitingp (kill-buffer work-buffer)))
(set-buffer-modified-p nil)))