Commit 04621aaa authored by Michael Albinus's avatar Michael Albinus
Browse files

(file-remote-p): Apply file name handler for operation

`file-remote-p'.  It isn' a property any longer.
(file-relative-name): `fh' and `fd' get the required value via
`find-file-name-handler' already.
parent 19a87064
...@@ -642,9 +642,10 @@ This is an interface to the function `load'." ...@@ -642,9 +642,10 @@ This is an interface to the function `load'."
(defun file-remote-p (file) (defun file-remote-p (file)
"Test whether FILE specifies a location on a remote system." "Test whether FILE specifies a location on a remote system."
(let ((handler (find-file-name-handler file 'file-local-copy))) (let ((handler (find-file-name-handler file 'file-remote-p)))
(if handler (if handler
(get handler 'file-remote-p)))) (funcall handler 'file-remote-p file)
nil)))
(defun file-local-copy (file) (defun file-local-copy (file)
"Copy the file FILE into a temporary file on this machine. "Copy the file FILE into a temporary file on this machine.
...@@ -2903,10 +2904,8 @@ on a DOS/Windows machine, it returns FILENAME on expanded form." ...@@ -2903,10 +2904,8 @@ on a DOS/Windows machine, it returns FILENAME on expanded form."
(file-name-as-directory (expand-file-name (or directory (file-name-as-directory (expand-file-name (or directory
default-directory)))) default-directory))))
(setq filename (expand-file-name filename)) (setq filename (expand-file-name filename))
(let ((hf (find-file-name-handler filename 'file-local-copy)) (let ((hf (find-file-name-handler filename 'file-remote-p))
(hd (find-file-name-handler directory 'file-local-copy))) (hd (find-file-name-handler directory 'file-remote-p)))
(when (and hf (not (get hf 'file-remote-p))) (setq hf nil))
(when (and hd (not (get hd 'file-remote-p))) (setq hd nil))
(if ;; Conditions for separate trees (if ;; Conditions for separate trees
(or (or
;; Test for different drives on DOS/Windows ;; Test for different drives on DOS/Windows
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment