mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-29 18:00:49 +00:00
Merge branch 'maint'
This commit is contained in:
commit
6b6476b89c
|
@ -595,8 +595,7 @@ If NO-CACHE is not nil, do not initialize `org-publish-cache'.
|
||||||
This is needed, since this function is used to publish single
|
This is needed, since this function is used to publish single
|
||||||
files, when entire projects are published (see
|
files, when entire projects are published (see
|
||||||
`org-publish-projects')."
|
`org-publish-projects')."
|
||||||
(let* ((filename (file-truename filename)) ;normalize name
|
(let* ((project
|
||||||
(project
|
|
||||||
(or project
|
(or project
|
||||||
(org-publish-get-project-from-filename filename)
|
(org-publish-get-project-from-filename filename)
|
||||||
(user-error "File %S is not part of any known project"
|
(user-error "File %S is not part of any known project"
|
||||||
|
@ -609,17 +608,15 @@ files, when entire projects are published (see
|
||||||
(f (list f))))
|
(f (list f))))
|
||||||
(base-dir
|
(base-dir
|
||||||
(file-name-as-directory
|
(file-name-as-directory
|
||||||
(file-truename
|
|
||||||
(or (org-publish-property :base-directory project)
|
(or (org-publish-property :base-directory project)
|
||||||
(user-error "Project %S does not have :base-directory defined"
|
(user-error "Project %S does not have :base-directory defined"
|
||||||
(car project))))))
|
(car project)))))
|
||||||
(pub-base-dir
|
(pub-base-dir
|
||||||
(file-name-as-directory
|
(file-name-as-directory
|
||||||
(file-truename
|
|
||||||
(or (org-publish-property :publishing-directory project)
|
(or (org-publish-property :publishing-directory project)
|
||||||
(user-error
|
(user-error
|
||||||
"Project %S does not have :publishing-directory defined"
|
"Project %S does not have :publishing-directory defined"
|
||||||
(car project))))))
|
(car project)))))
|
||||||
(pub-dir
|
(pub-dir
|
||||||
(file-name-directory
|
(file-name-directory
|
||||||
(expand-file-name (file-relative-name filename base-dir)
|
(expand-file-name (file-relative-name filename base-dir)
|
||||||
|
|
Loading…
Reference in a new issue