ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode 

Conflicts:

	ORGWEBPAGE/Changes.org
This commit is contained in:
Carsten Dominik 2008-03-10 18:02:45 +01:00
parent bab92717e5 8891396992
commit 578865ebdc
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
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-publish.el (org-publish-before-export-hook)

5
org-publish.el
View File

@ -516,7 +516,10 @@ FILENAME is the filename of the file to be published."
(defun org-publish-file (filename &optional project)
"Publish file FILENAME from PROJECT."
(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))
(publishing-function (or (plist-get project-plist :publishing-function)
'org-publish-org-to-html))