diff options
| author | Miles Bader <miles@gnu.org> | 2007-07-24 01:25:28 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-07-24 01:25:28 +0000 |
| commit | 492d9f3e3ccd2b640958e840caa451e9e04e86db (patch) | |
| tree | c87779daf272535b621216ef05179fa48102e57e /lispref | |
| parent | 7eb1e4534e88a32fe5e549e630fdabf3e062be2b (diff) | |
| parent | 1e8995158740b15936887264a3d7183beb5c51d9 (diff) | |
| download | emacs-492d9f3e3ccd2b640958e840caa451e9e04e86db.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 814-823)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 59-69)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 237-238)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-26
Diffstat (limited to 'lispref')
| -rw-r--r-- | lispref/ChangeLog | 9 | ||||
| -rw-r--r-- | lispref/display.texi | 4 | ||||
| -rw-r--r-- | lispref/files.texi | 9 |
3 files changed, 19 insertions, 3 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog index 5102e723566..bc81ca4d4e7 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -1,3 +1,12 @@ +2007-07-17 Michael Albinus <michael.albinus@gmx.de> + + * files.texi (Magic File Names): Introduce optional parameter + IDENTIFICATION for `file-remote-p'. + +2007-07-16 Richard Stallman <rms@gnu.org> + + * display.texi (Defining Faces): Fix previous change. + 2007-07-14 Richard Stallman <rms@gnu.org> * control.texi (Handling Errors): Document `debug' in handler list. diff --git a/lispref/display.texi b/lispref/display.texi index f4d7a5dbcdb..84c9ba84935 100644 --- a/lispref/display.texi +++ b/lispref/display.texi @@ -1760,10 +1760,10 @@ When @code{defface} executes, it defines the face according to @var{spec}, then uses any customizations that were read from the init file (@pxref{Init File}) to override that specification. -When you evaluate a @code{defcustom} form with @kbd{C-M-x} in Emacs +When you evaluate a @code{defface} form with @kbd{C-M-x} in Emacs Lisp mode (@code{eval-defun}), a special feature of @code{eval-defun} overrides any customizations of the face. This way, the face reflects -exactly what the @code{defcustom} says. +exactly what the @code{defface} says. The purpose of @var{spec} is to specify how the face should appear on different kinds of terminals. It should be an alist whose elements 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 of the local copy file. @end defun -@defun file-remote-p filename &optional connected +@defun file-remote-p filename &optional identification connected This function tests whether @var{filename} is a remote file. If @var{filename} is local (not remote), the return value is @code{nil}. If @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 files at the same time. Implementors of file handlers need to ensure this principle is valid. +@var{identification} specifies which part of the identifier shall be +returned as string. @var{identification} can be the symbol +@code{method}, @code{user} or @code{host}; any other value is handled +like @code{nil} and means to return the complete identifier string. +In the example above, the remote @code{user} identifier string would +be @code{root}. + If @var{connected} is non-@code{nil}, this function returns @code{nil} even if @var{filename} is remote, if Emacs has no network connection to its host. This is useful when you want to avoid the delay of |