Browse Source

Merge branch 'maint'

Nicolas Goaziou 8 years ago
parent
commit
6b6476b89c
1 changed files with 8 additions and 11 deletions
  1. 8 11
      lisp/ox-publish.el

+ 8 - 11
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
 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
-	 (project
+  (let* ((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)
-		(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
 	 (pub-base-dir
 	  (file-name-as-directory
 	  (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
 	 (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)