Mercurial > emacs
changeset 55845:6d0508ef2a09
(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.
| author | Michael Albinus <michael.albinus@gmx.de> |
|---|---|
| date | Sat, 29 May 2004 22:42:06 +0000 |
| parents | 4bc6cb45c326 |
| children | aed680fa845d |
| files | lisp/files.el |
| diffstat | 1 files changed, 5 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/files.el Sat May 29 22:28:49 2004 +0000 +++ b/lisp/files.el Sat May 29 22:42:06 2004 +0000 @@ -642,9 +642,10 @@ (defun file-remote-p (file) "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 - (get handler 'file-remote-p)))) + (funcall handler 'file-remote-p file) + nil))) (defun file-local-copy (file) "Copy the file FILE into a temporary file on this machine. @@ -2903,10 +2904,8 @@ (file-name-as-directory (expand-file-name (or directory default-directory)))) (setq filename (expand-file-name filename)) - (let ((hf (find-file-name-handler filename 'file-local-copy)) - (hd (find-file-name-handler directory 'file-local-copy))) - (when (and hf (not (get hf 'file-remote-p))) (setq hf nil)) - (when (and hd (not (get hd 'file-remote-p))) (setq hd nil)) + (let ((hf (find-file-name-handler filename 'file-remote-p)) + (hd (find-file-name-handler directory 'file-remote-p))) (if ;; Conditions for separate trees (or ;; Test for different drives on DOS/Windows