branch: master
commit 1b1063ac7b7f10f37a09cd7f72c0f3ea53fbe442
Merge: 8c09e73 e5eb534
Author: Alexey Veretennikov <alexey.veretenni...@gmail.com>
Commit: Alexey Veretennikov <alexey.veretenni...@gmail.com>
Merge commit 'e5eb534859acc0cc0a13403fd166457db9fb7eb5'
Added fix for debbugs 24200 debbugs.gnu.org/24200 proposed by Michael
Albinus
---
packages/ztree/ztree-util.el | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/packages/ztree/ztree-util.el b/packages/ztree/ztree-util.el
index 07935b7..39975b0 100644
--- a/packages/ztree/ztree-util.el
+++ b/packages/ztree/ztree-util.el
@@ -67,14 +67,7 @@ Used since `car-safe' returns nil for atoms"
(defun ztree-untrampify-filename (file)
"Return FILE as the local file name."
- ;; FIXME: We shouldn't use internal Tramp functions.
- (require 'tramp)
- (declare-function tramp-tramp-file-p "tramp" (name))
- (declare-function tramp-file-name-localname "tramp" (vec))
- (declare-function tramp-dissect-file-name "tramp" (name &optional nodefault))
- (if (not (tramp-tramp-file-p file))
- file
- (tramp-file-name-localname (tramp-dissect-file-name file))))
+ (or (file-remote-p file 'localname) file))
(defun ztree-quotify-string (str)
"Surround STR with quotes."
