Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-353
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-354
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-355
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-356
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-183

5 files changed, 33 insertions, 11 deletions

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index aa49c8d1d17..efa5eb94091 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,20 @@
+2004-05-30  Richard M. Stallman  <rms@gnu.org>
+
+        * loading.texi (Named Features): Clarify return value
+        and meaning of NOERROR.
+
+        * variables.texi (File Local Variables): Minor cleanup.
+
+2004-05-30  Michael Albinus  <michael.albinus@gmx.de>
+
+        * files.texi (Magic File Names): Add `file-remote-p' as operation
+        of file name handlers.
+
+2004-05-29  Richard M. Stallman  <rms@gnu.org>
+
+        * modes.texi (Minor Mode Conventions): (-) has no special meaning
+        as arg to a minor mode command.
+
 2004-05-22  Richard M. Stallman  <rms@gnu.org>
 
         * syntax.texi (Syntax Class Table): Word syntax not just for English.
diff --git a/lispref/files.texi b/lispref/files.texi
index 7ea482efa51..aa5b0c397b1 100644
--- a/lispref/files.texi
+++ b/lispref/files.texi
@@ -2493,7 +2493,7 @@ Here are the operations that a magic file name handler gets to handle:
 @code{file-attributes},
 @code{file-directory-p},
 @code{file-executable-p}, @code{file-exists-p},
-@code{file-local-copy},
+@code{file-local-copy}, @code{file-remote-p},
 @code{file-modes}, @code{file-name-all-completions},
 @code{file-name-as-directory},
 @code{file-name-completion},
@@ -2537,7 +2537,7 @@ Here are the operations that a magic file name handler gets to handle:
 @code{file-attributes},
 @code{file-direct@discretionary{}{}{}ory-p},
 @code{file-executable-p}, @code{file-exists-p},
-@code{file-local-copy},
+@code{file-local-copy}, @code{file-remote-p},
 @code{file-modes}, @code{file-name-all-completions},
 @code{file-name-as-directory},
 @code{file-name-completion},
@@ -2645,8 +2645,7 @@ of the local copy file.
 @end defun
 
 @defun file-remote-p filename
-This function returns @code{t} if @var{filename} is a remote file---that is,
-a magic file name that handles @code{file-local-copy}.
+This function returns @code{t} if @var{filename} is a remote file.
 @end defun
 
 @defun unhandled-file-name-directory filename
diff --git a/lispref/loading.texi b/lispref/loading.texi
index 893b41d2e51..4d13e48def5 100644
--- a/lispref/loading.texi
+++ b/lispref/loading.texi
@@ -687,9 +687,14 @@ However, in this case, @code{require} insists on finding @var{feature}
 with an added suffix; a file whose name is just @var{feature} won't be
 used.
 
-If loading the file fails to provide @var{feature}, @code{require}
-signals an error, @samp{Required feature @var{feature} was not
-provided}, unless @var{noerror} is non-@code{nil}.
+If @var{noerror} is non-@code{nil}, that suppresses errors from actual
+loading of the file.  In that case, @code{require} returns @code{nil}
+if loading the file fails.  Normally, @code{require} returns
+@var{feature}.
+
+If loading the file succeeds but does not provide @var{feature},
+@code{require} signals an error, @samp{Required feature @var{feature}
+was not provided}.
 @end defun
 
 @defun featurep feature &optional subfeature
diff --git a/lispref/modes.texi b/lispref/modes.texi
index d92ea309ed7..040c229bb00 100644
--- a/lispref/modes.texi
+++ b/lispref/modes.texi
@@ -879,8 +879,9 @@ The command should accept one optional argument.  If the argument is
 off if it is on).  It should turn the mode on if the argument is a
 positive integer, the symbol @code{t}, or a list whose @sc{car} is one
 of those.  It should turn the mode off if the argument is a negative
-integer or zero, the symbol @code{-}, or a list whose @sc{car} is one
-of those.  The meaning of other arguments is not specified.
+integer or zero, the symbol @code{-}, or a list whose @sc{car} is a
+negative integer or zero.  The meaning of other arguments is not
+specified.
 
 Here is an example taken from the definition of @code{transient-mark-mode}.
 It shows the use of @code{transient-mark-mode} as a variable that enables or
diff --git a/lispref/variables.texi b/lispref/variables.texi
index f4c56ede4d9..c395702a40a 100644
--- a/lispref/variables.texi
+++ b/lispref/variables.texi
@@ -1769,8 +1769,8 @@ nor any other file local variable.  It does not check whether a mode
 is specified in the local variables list at the end of the file.
 @end defun
 
-  If a file local variable list could specify a function that will
-be called later, or an expression that will be executed later, simply
+  If a file local variable list could specify a function that would
+be called later, or an expression that would be executed later, simply
 visiting a file could take over your Emacs.  To prevent this, Emacs
 takes care not to allow local variable lists to set such variables.