From 118ec40c53c1834f5af790e92443f9fc8c8eb169 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 25 May 2017 11:08:02 +0200 Subject: [PATCH] ox-publish: Fix symlink publishing * lisp/ox-publish.el (org-publish-file): Do not expand symlinks so as to get proper publishing directory. Reported-by: Julien Cubizolles --- lisp/ox-publish.el | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/lisp/ox-publish.el b/lisp/ox-publish.el index bd059e894..884d6bf69 100644 --- a/lisp/ox-publish.el +++ b/lisp/ox-publish.el @@ -665,8 +665,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" @@ -679,17 +678,15 @@ files, when entire projects are published (see (f (list f)))) (base-dir (file-name-as-directory - (file-truename - (or (plist-get project-plist :base-directory) - (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 (eval (plist-get project-plist :publishing-directory)) - (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)