[Emacs-diffs] Changes to emacs/lisp/net/ange-ftp.el,v

[Michael Albinus]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Michael Albinus <albinus>       07/07/17 21:09:13

Index: ange-ftp.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/net/ange-ftp.el,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- ange-ftp.el 8 Jul 2007 18:03:18 -0000       1.86
+++ ange-ftp.el 17 Jul 2007 21:09:12 -0000      1.87
@@ -4132,15 +4132,19 @@
                                       (format "Getting %s" fn1))
          tmp1))))
 
-(defun ange-ftp-file-remote-p (file &optional connected)
-  (and (or (not connected)
+(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))
-                 (proc (get-process (ange-ftp-ftp-process-buffer host user))))
+        (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)))))
-       (ange-ftp-replace-name-component file "")))
+        (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)