summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2018-02-15 15:04:59 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2018-02-15 15:04:59 +0100
commitbbcf2f939cb8820b2e9d922b435a13a1d280da75 (patch)
tree2431ce82d180a67f91baff851a4efa49401932e1
parent58da7d4d177a7d2e92e22110f4ad51158fba53b0 (diff)
parentdf80fde9d015d5f739003a06318c6a51ad68dd75 (diff)
downloadorg-mode-bbcf2f939cb8820b2e9d922b435a13a1d280da75.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/ox-publish.el8
-rw-r--r--testing/examples/pub-symlink/link.org3
l---------testing/examples/pub/link2
3 files changed, 6 insertions, 7 deletions
diff --git a/lisp/ox-publish.el b/lisp/ox-publish.el
index aa14db0..3658d41 100644
--- a/lisp/ox-publish.el
+++ b/lisp/ox-publish.el
@@ -575,7 +575,7 @@ Return output file name."
`(:crossrefs
,(org-publish-cache-get-file-property
;; Normalize file names in cache.
- (expand-file-name filename) :crossrefs nil t)
+ (file-truename filename) :crossrefs nil t)
:filter-final-output
(org-publish--store-crossrefs
org-publish-collect-index
@@ -1027,7 +1027,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 (expand-file-name (plist-get info :input-file))))
+ (let ((file (file-truename (plist-get info :input-file))))
(org-publish-cache-set-file-property
file :index
(delete-dups
@@ -1136,7 +1136,7 @@ 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
- (expand-file-name (plist-get info :input-file))
+ (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
@@ -1181,7 +1181,7 @@ references with `org-export-get-reference'."
file)
"MissingReference"))
(t
- (let* ((filename (expand-file-name file))
+ (let* ((filename (file-truename file))
(crossrefs
(org-publish-cache-get-file-property filename :crossrefs nil t))
(cells
diff --git a/testing/examples/pub-symlink/link.org b/testing/examples/pub-symlink/link.org
index 9fded34..8d7221c 100644
--- a/testing/examples/pub-symlink/link.org
+++ b/testing/examples/pub-symlink/link.org
@@ -1,2 +1 @@
-# Time-stamp: <2018-02-13 10:12:03 ngz>
-symlink
+Symlink
diff --git a/testing/examples/pub/link b/testing/examples/pub/link
index 663715b..01bb515 120000
--- a/testing/examples/pub/link
+++ b/testing/examples/pub/link
@@ -1 +1 @@
-/home/ngz/dev/org-mode/testing/examples/pub-symlink \ No newline at end of file
+../pub-symlink \ No newline at end of file