diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-05-25 11:10:19 +0200 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-05-25 11:10:19 +0200 |
commit | 6b6476b89cc5fe352239f4afa50aad9234785ed5 (patch) | |
tree | 5221af0e90d7ec20bb0112efa756cb309575390a | |
parent | 30ceb5c7942b5804b2bba18ce3e08124add0d278 (diff) | |
parent | 118ec40c53c1834f5af790e92443f9fc8c8eb169 (diff) | |
download | org-mode-6b6476b89cc5fe352239f4afa50aad9234785ed5.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/ox-publish.el | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/lisp/ox-publish.el b/lisp/ox-publish.el index a41f825..2d72371 100644 --- a/lisp/ox-publish.el +++ b/lisp/ox-publish.el @@ -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 files, when entire projects are published (see `org-publish-projects')." - (let* ((filename (file-truename filename)) ;normalize name - (project + (let* ((project (or project (org-publish-get-project-from-filename filename) (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)))) (base-dir (file-name-as-directory - (file-truename - (or (org-publish-property :base-directory project) - (user-error "Project %S does not have :base-directory defined" - (car project)))))) + (or (org-publish-property :base-directory project) + (user-error "Project %S does not have :base-directory defined" + (car project))))) (pub-base-dir (file-name-as-directory - (file-truename - (or (org-publish-property :publishing-directory project) - (user-error - "Project %S does not have :publishing-directory defined" - (car project)))))) + (or (org-publish-property :publishing-directory project) + (user-error + "Project %S does not have :publishing-directory defined" + (car project))))) (pub-dir (file-name-directory (expand-file-name (file-relative-name filename base-dir) |