summaryrefslogtreecommitdiff
path: root/lisp/files.el
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2019-09-07 10:14:31 +0300
committerEli Zaretskii <eliz@gnu.org>2019-09-07 10:14:31 +0300
commitf42509955901bbc81284b5141cf272a1f6c6ad4c (patch)
tree7e4ef2dd5346a18fe66ba9c359644834ef2bbe4b /lisp/files.el
parenta59839d7556ef85058e09b005f0ff32e59b20ec3 (diff)
downloademacs-f42509955901bbc81284b5141cf272a1f6c6ad4c.tar.gz
Revert "file-truename now uses realpath for local files"
This reverts commit a59839d7556ef85058e09b005f0ff32e59b20ec3. This commit broke the MS-Windows build (because there's no realpath on MS-Windows). Even if I change the implementation to always signal an error on MS-Windows, the build fails.
Diffstat (limited to 'lisp/files.el')
-rw-r--r--lisp/files.el11
1 files changed, 3 insertions, 8 deletions
diff --git a/lisp/files.el b/lisp/files.el
index d32c6acb82c..ce4dd99bd53 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1307,14 +1307,9 @@ containing it, until no links are left at any level.
(let ((handler (find-file-name-handler filename 'file-truename)))
;; For file name that has a special handler, call handler.
;; This is so that ange-ftp can save time by doing a no-op.
- (or
- (if handler
- (setq filename (funcall handler 'file-truename filename)
- done t)
- (condition-case nil
- (setq filename (fileio--truename filename)
- done t)
- (file-missing nil)))
+ (if handler
+ (setq filename (funcall handler 'file-truename filename)
+ done t)
(let ((dir (or (file-name-directory filename) default-directory))
target dirfile)
;; Get the truename of the directory.