summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-05-05 23:23:29 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2017-05-05 23:23:29 +0200
commit449f97abbbf383f9c37cfa1995c76f17437a8a65 (patch)
tree918126cefafa51e36256b35c4a5b860e94c48446
parentc55770006aab2086dadb99f5e448fc2c0f598a70 (diff)
parent250b64b3cb9a538b853312b787f98015747b2a01 (diff)
downloadorg-mode-449f97abbbf383f9c37cfa1995c76f17437a8a65.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/ox-publish.el10
1 files changed, 6 insertions, 4 deletions
diff --git a/lisp/ox-publish.el b/lisp/ox-publish.el
index ed98efb..6847980 100644
--- a/lisp/ox-publish.el
+++ b/lisp/ox-publish.el
@@ -557,7 +557,8 @@ Return output file name."
plist
`(:crossrefs
,(org-publish-cache-get-file-property
- (expand-file-name filename) :crossrefs nil t)
+ ;; Normalize file names in cache.
+ (file-truename filename) :crossrefs nil t)
:filter-final-output
(org-publish--store-crossrefs
org-publish-collect-index
@@ -1011,7 +1012,7 @@ PARENT is a reference to the headline, if any, containing the
original index keyword. When non-nil, this reference is a cons
cell. Its CAR is a symbol among `id', `custom-id' and `name' and
its CDR is a string."
- (let ((file (plist-get info :input-file)))
+ (let ((file (file-truename (plist-get info :input-file))))
(org-publish-cache-set-file-property
file :index
(delete-dups
@@ -1120,7 +1121,8 @@ a plist.
This function is meant to be used as a final output filter. See
`org-publish-org-to'."
(org-publish-cache-set-file-property
- (plist-get info :input-file) :crossrefs
+ (file-truename (plist-get info :input-file))
+ :crossrefs
;; Update `:crossrefs' so as to remove unused references and search
;; cells. Actually used references are extracted from
;; `:internal-references', with references as strings removed. See
@@ -1150,7 +1152,7 @@ references with `org-export-get-reference'."
search
file)
"MissingReference")
- (let* ((filename (expand-file-name file))
+ (let* ((filename (file-truename file))
(crossrefs
(org-publish-cache-get-file-property filename :crossrefs nil t))
(cells (org-export-string-to-search-cell search)))