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:
parent
69eb39a4a9
commit
a597a8b622
@ -3248,7 +3248,10 @@ is the property list for the given project. PUB-DIR is the
|
|||||||
publishing directory.
|
publishing directory.
|
||||||
|
|
||||||
Return output file name."
|
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
|
;;; FIXME
|
||||||
|
@ -146,6 +146,8 @@ Return output file name."
|
|||||||
(require 'ox-html)
|
(require 'ox-html)
|
||||||
(let* ((org-inhibit-startup t)
|
(let* ((org-inhibit-startup t)
|
||||||
(htmlize-output-type 'css)
|
(htmlize-output-type 'css)
|
||||||
|
(html-ext (concat "." (or (plist-get plist :html-extension)
|
||||||
|
org-html-extension "html")))
|
||||||
(visitingp (find-buffer-visiting filename))
|
(visitingp (find-buffer-visiting filename))
|
||||||
(work-buffer (or visitingp (find-file filename)))
|
(work-buffer (or visitingp (find-file filename)))
|
||||||
newbuf)
|
newbuf)
|
||||||
@ -160,7 +162,7 @@ Return output file name."
|
|||||||
(format
|
(format
|
||||||
"<link rel=\"stylesheet\" type=\"text/css\" href=\"%s\">"
|
"<link rel=\"stylesheet\" type=\"text/css\" href=\"%s\">"
|
||||||
org-org-htmlized-css-url) t t)))
|
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)
|
(kill-buffer newbuf)
|
||||||
(unless visitingp (kill-buffer work-buffer)))
|
(unless visitingp (kill-buffer work-buffer)))
|
||||||
(set-buffer-modified-p nil)))
|
(set-buffer-modified-p nil)))
|
||||||
|
Loading…
Reference in New Issue
Block a user