--- a/lisp/prim/files.el	Mon Aug 13 08:50:06 2007 +0200
+++ b/lisp/prim/files.el	Mon Aug 13 08:50:29 2007 +0200
@@ -2572,7 +2572,10 @@
 	files
 	(buffer (get-buffer-create " *recover*")))
     ;; #### dired-do-flagged-delete in FSF.
-    (dired-do-deletions t)
+    ;; This version is for ange-ftp
+    ;;(dired-do-deletions t)
+    ;T This version is for efs
+    (dired-expunge-deletions)
     (unwind-protect
 	(save-excursion
 	  ;; Read in the auto-save-list file.
@@ -3003,6 +3006,14 @@
 	filename
       (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 ((fboundp 'efs-ftp-path) (efs-ftp-path name))
+	((fboundp 'ange-ftp-ftp-name) (ange-ftp-ftp-name name))
+	(t 'unknown)))
 
 ;; Written in C in FSF
 (defun insert-file-contents (filename &optional visit beg end replace)