From f6be091c471ba7a0c4b4f3e8ce851f96daae7bbe Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Mon, 16 Jul 2007 03:50:51 +0000 Subject: (Defining Faces): Fix previous change. --- lispref/ChangeLog | 4 ++++ lispref/display.texi | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'lispref') diff --git a/lispref/ChangeLog b/lispref/ChangeLog index 0bd727f0748..61ee06011e6 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -1,3 +1,7 @@ +2007-07-16 Richard Stallman + + * display.texi (Defining Faces): Fix previous change. + 2007-07-10 Richard Stallman * display.texi (Defining Faces): Explain C-M-x feature for defface. diff --git a/lispref/display.texi b/lispref/display.texi index 8cf25110308..cd46a0e72ba 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 -- cgit v1.2.1 From eab01edba904a8d591bc1a13a4e710492a7bf721 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 17 Jul 2007 21:29:20 +0000 Subject: * files.texi (Magic File Names): Introduce optional parameter IDENTIFICATION for `file-remote-p'. --- lispref/ChangeLog | 5 +++++ lispref/files.texi | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'lispref') diff --git a/lispref/ChangeLog b/lispref/ChangeLog index 5102e723566..5dc45b43b33 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -1,3 +1,8 @@ +2007-07-17 Michael Albinus + + * files.texi (Magic File Names): Introduce optional parameter + IDENTIFICATION for `file-remote-p'. + 2007-07-14 Richard Stallman * 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 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 -- cgit v1.2.1