mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

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 <j.cubizolles@free.fr>
<http://permalink.gmane.org/gmane.emacs.orgmode/113611>
This commit is contained in:
Nicolas Goaziou 2017-05-25 11:08:02 +02:00
parent f4803cfad4
commit 118ec40c53
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lisp/ox-publish.el
View File

@ -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)