aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2008-09-29 05:42:20 +0000
committerMichael Albinus2008-09-29 05:42:20 +0000
commitd5fb39b4c6723ceef19e92ca70f4f01371ff5592 (patch)
treeb392b52ddd33e490f02cc0a8556ec59adb2a1826
parent9f2f6ad816ec17abe8aa47cc7c31e665f1931d6a (diff)
downloademacs-d5fb39b4c6723ceef19e92ca70f4f01371ff5592.tar.gz
emacs-d5fb39b4c6723ceef19e92ca70f4f01371ff5592.zip
* net/ange-ftp.el (ange-ftp-file-remote-p): Handle `localname' as
identification.
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/net/ange-ftp.el4
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 @@
12008-09-29 Michael Albinus <michael.albinus@gmx.de>
2
3 * files.el (file-remote-p): Precise doc string; IDENTIFICATION can
4 also be `localname'.
5
6 * net/ange-ftp.el (ange-ftp-file-remote-p): Handle `localname' as
7 identification.
8
12008-09-28 Glenn Morris <rgm@gnu.org> 92008-09-28 Glenn Morris <rgm@gnu.org>
2 10
3 * vc.el (vc-switches): Give it a doc string. 11 * 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."
4127(defun ange-ftp-file-remote-p (file &optional identification connected) 4127(defun ange-ftp-file-remote-p (file &optional identification connected)
4128 (let* ((parsed (ange-ftp-ftp-name file)) 4128 (let* ((parsed (ange-ftp-ftp-name file))
4129 (host (nth 0 parsed)) 4129 (host (nth 0 parsed))
4130 (user (nth 1 parsed))) 4130 (user (nth 1 parsed))
4131 (localname (nth 2 parsed)))
4131 (and (or (not connected) 4132 (and (or (not connected)
4132 (let ((proc (get-process (ange-ftp-ftp-process-buffer host user)))) 4133 (let ((proc (get-process (ange-ftp-ftp-process-buffer host user))))
4133 (and proc (processp proc) 4134 (and proc (processp proc)
@@ -4136,6 +4137,7 @@ directory, so that Emacs will know its current contents."
4136 ((eq identification 'method) (and parsed "ftp")) 4137 ((eq identification 'method) (and parsed "ftp"))
4137 ((eq identification 'user) user) 4138 ((eq identification 'user) user)
4138 ((eq identification 'host) host) 4139 ((eq identification 'host) host)
4140 ((eq identification 'localname) localname)
4139 (t (ange-ftp-replace-name-component file "")))))) 4141 (t (ange-ftp-replace-name-component file ""))))))
4140 4142
4141(defun ange-ftp-load (file &optional noerror nomessage nosuffix) 4143(defun ange-ftp-load (file &optional noerror nomessage nosuffix)