mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-05 22:43:18 +00:00
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
Conflicts: ORGWEBPAGE/Changes.org
This commit is contained in:
commit
578865ebdc
|
@ -1,5 +1,8 @@
|
||||||
2008-03-10 Bastien Guerry <bzg@altern.org>
|
2008-03-10 Bastien Guerry <bzg@altern.org>
|
||||||
|
|
||||||
|
* org-publish.el (org-publish-file): Send an error when file is
|
||||||
|
not part of any project.
|
||||||
|
|
||||||
* org.el (org-select-remember-template): Cleaned the code.
|
* org.el (org-select-remember-template): Cleaned the code.
|
||||||
|
|
||||||
* org-publish.el (org-publish-before-export-hook)
|
* org-publish.el (org-publish-before-export-hook)
|
||||||
|
|
|
@ -516,7 +516,10 @@ FILENAME is the filename of the file to be published."
|
||||||
(defun org-publish-file (filename &optional project)
|
(defun org-publish-file (filename &optional project)
|
||||||
"Publish file FILENAME from PROJECT."
|
"Publish file FILENAME from PROJECT."
|
||||||
(when (org-publish-needed-p filename)
|
(when (org-publish-needed-p filename)
|
||||||
(let* ((project (or project (org-publish-get-project-from-filename filename)))
|
(let* ((project (or project
|
||||||
|
(or (org-publish-get-project-from-filename filename)
|
||||||
|
(error "File %s is not part of any known project"
|
||||||
|
filename))))
|
||||||
(project-plist (cdr project))
|
(project-plist (cdr project))
|
||||||
(publishing-function (or (plist-get project-plist :publishing-function)
|
(publishing-function (or (plist-get project-plist :publishing-function)
|
||||||
'org-publish-org-to-html))
|
'org-publish-org-to-html))
|
||||||
|
|
Loading…
Reference in a new issue