aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2007-07-17 21:29:20 +0000
committerMichael Albinus2007-07-17 21:29:20 +0000
commiteab01edba904a8d591bc1a13a4e710492a7bf721 (patch)
treef99ad3776fbe50f2c1a82604455f81d6681e873f
parentea382aff15872b84f85be389b4118efc6c3412e2 (diff)
downloademacs-eab01edba904a8d591bc1a13a4e710492a7bf721.tar.gz
emacs-eab01edba904a8d591bc1a13a4e710492a7bf721.zip
* files.texi (Magic File Names): Introduce optional parameter
IDENTIFICATION for `file-remote-p'.
-rw-r--r--lispref/ChangeLog5
-rw-r--r--lispref/files.texi9
2 files changed, 13 insertions, 1 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 5102e723566..5dc45b43b33 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,8 @@
12007-07-17 Michael Albinus <michael.albinus@gmx.de>
2
3 * files.texi (Magic File Names): Introduce optional parameter
4 IDENTIFICATION for `file-remote-p'.
5
12007-07-14 Richard Stallman <rms@gnu.org> 62007-07-14 Richard Stallman <rms@gnu.org>
2 7
3 * control.texi (Handling Errors): Document `debug' in handler list. 8 * control.texi (Handling Errors): Document `debug' in handler list.
diff --git a/lispref/files.texi b/lispref/files.texi
index 343a6bc5e39..bfcbe476f95 100644
--- a/lispref/files.texi
+++ b/lispref/files.texi
@@ -2768,7 +2768,7 @@ nothing and returns @code{nil}. Otherwise it returns the file name
2768of the local copy file. 2768of the local copy file.
2769@end defun 2769@end defun
2770 2770
2771@defun file-remote-p filename &optional connected 2771@defun file-remote-p filename &optional identification connected
2772This function tests whether @var{filename} is a remote file. If 2772This function tests whether @var{filename} is a remote file. If
2773@var{filename} is local (not remote), the return value is @code{nil}. 2773@var{filename} is local (not remote), the return value is @code{nil}.
2774If @var{filename} is indeed remote, the return value is a string that 2774If @var{filename} is indeed remote, the return value is a string that
@@ -2786,6 +2786,13 @@ example, that it is possible to start a remote process accessing both
2786files at the same time. Implementors of file handlers need to ensure 2786files at the same time. Implementors of file handlers need to ensure
2787this principle is valid. 2787this principle is valid.
2788 2788
2789@var{identification} specifies which part of the identifier shall be
2790returned as string. @var{identification} can be the symbol
2791@code{method}, @code{user} or @code{host}; any other value is handled
2792like @code{nil} and means to return the complete identifier string.
2793In the example above, the remote @code{user} identifier string would
2794be @code{root}.
2795
2789If @var{connected} is non-@code{nil}, this function returns @code{nil} 2796If @var{connected} is non-@code{nil}, this function returns @code{nil}
2790even if @var{filename} is remote, if Emacs has no network connection 2797even if @var{filename} is remote, if Emacs has no network connection
2791to its host. This is useful when you want to avoid the delay of 2798to its host. This is useful when you want to avoid the delay of