2 files changed, 11 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3e579879a9e..f8af9ff09cf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2008-09-29  Michael Albinus  <michael.albinus@gmx.de>
+
+        * files.el (file-remote-p): Precise doc string; IDENTIFICATION can
+        also be `localname'.
+
+        * net/ange-ftp.el (ange-ftp-file-remote-p): Handle `localname' as
+        identification.
+
 2008-09-28  Glenn Morris  <rgm@gnu.org>
 
         * vc.el (vc-switches): Give it a doc string.
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 0d1b16b4b46..eb3174d42a3 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -4127,7 +4127,8 @@ directory, so that Emacs will know its current contents."
 (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)))
+         (user (nth 1 parsed))
+         (localname (nth 2 parsed)))
     (and (or (not connected)
              (let ((proc (get-process (ange-ftp-ftp-process-buffer host user))))
                (and proc (processp proc)
@@ -4136,6 +4137,7 @@ directory, so that Emacs will know its current contents."
           ((eq identification 'method) (and parsed "ftp"))
           ((eq identification 'user) user)
           ((eq identification 'host) host)
+          ((eq identification 'localname) localname)
           (t (ange-ftp-replace-name-component file ""))))))
 
 (defun ange-ftp-load (file &optional noerror nomessage nosuffix)