--- a/lisp/prim/files.el	Mon Aug 13 09:21:56 2007 +0200
+++ b/lisp/prim/files.el	Mon Aug 13 09:23:06 2007 +0200
@@ -2940,12 +2940,10 @@
       (error "Apparently circular symlink path"))))
 
 ;; Suggested by Michael Kifer <kifer@CS.SunySB.EDU>
-(defun file-remote-p (file)
-  "Test whether file resides on the local system.
-The special value 'unknown is returned if no remote file access package
-has been loaded."
-  (cond ((featurep 'ange-ftp) (ange-ftp-ftp-path file-name))
-        (t (require 'efs)
-	   (efs-ftp-path file-name))))
+(defun file-remote-p (file-name)
+  "Test whether FILE-NAME is looked for on a remote system."
+  (cond ((not allow-remote-paths) nil)
+	((featurep 'ange-ftp) (ange-ftp-ftp-path file-name))
+	(t (efs-ftp-path file-name))))
 
 ;;; files.el ends here