# HG changeset patch
# User Michael Albinus <michael.albinus@gmx.de>
# Date 1184706552 0
# Node ID c2b7868011b140840997a4841e611b2f0c4765f5
# Parent  64c6efb87c402ffa8634da2bc88c3585844cd04d
* net/ange-ftp.el: (ange-ftp-file-remote-p): Handle optional
parameter IDENTIFICATION.

diff -r 64c6efb87c40 -r c2b7868011b1 lisp/net/ange-ftp.el
--- a/lisp/net/ange-ftp.el	Tue Jul 17 21:08:49 2007 +0000
+++ b/lisp/net/ange-ftp.el	Tue Jul 17 21:09:12 2007 +0000
@@ -4132,15 +4132,19 @@
 				       (format "Getting %s" fn1))
 	  tmp1))))
 
-(defun ange-ftp-file-remote-p (file &optional connected)
-  (and (or (not connected)
-	   (let* ((parsed (ange-ftp-ftp-name file))
-		  (host (nth 0 parsed))
-		  (user (nth 1 parsed))
-		  (proc (get-process (ange-ftp-ftp-process-buffer host user))))
-	     (and proc (processp proc)
-		  (memq (process-status proc) '(run open)))))
-       (ange-ftp-replace-name-component file "")))
+(defun ange-ftp-file-remote-p (file &optional identification connected)
+  (let* ((parsed (ange-ftp-ftp-name file))
+	 (host (nth 0 parsed))
+	 (user (nth 1 parsed)))
+    (and (or (not connected)
+	     (let ((proc (get-process (ange-ftp-ftp-process-buffer host user))))
+	       (and proc (processp proc)
+		    (memq (process-status proc) '(run open)))))
+	 (cond
+	  ((eq identification 'method) (and parsed "ftp"))
+	  ((eq identification 'user) user)
+	  ((eq identification 'host) host)
+	  (t (ange-ftp-replace-name-component file ""))))))
 
 (defun ange-ftp-load (file &optional noerror nomessage nosuffix)
   (if (ange-ftp-ftp-name file)