Merged from miles@gnu.org--gnu-2005 (patch 292-295)

Patches applied:

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

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

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

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

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

3 files changed, 15 insertions, 5 deletions

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 672a70d478f..aa90a4f0e73 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,14 @@
+2005-05-08  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * variables.texi (File Local Variables): `(hack-local-variables t)'
+        now also checks whether a mode is specified in the local variables
+        list.
+
+2005-05-05  Kevin Ryde  <user42@zip.com.au>
+
+        * display.texi (The Echo Area): Correct format function cross
+        reference.
+
 2005-05-05  Luc Teirlinck  <teirllm@auburn.edu>
 
         * variables.texi (Variable Aliases): Change description of
diff --git a/lispref/display.texi b/lispref/display.texi
index 76bf99e0ede..7f91072ca5d 100644
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -200,7 +200,7 @@ follows:
 @defun message string &rest arguments
 This function displays a message in the echo area.  The
 argument @var{string} is similar to a C language @code{printf} control
-string.  See @code{format} in @ref{String Conversion}, for the details
+string.  See @code{format} in @ref{Formatting Strings}, for the details
 on the conversion specifications.  @code{message} returns the
 constructed string.
 
diff --git a/lispref/variables.texi b/lispref/variables.texi
index 5ece7e98906..28eab924eca 100644
--- a/lispref/variables.texi
+++ b/lispref/variables.texi
@@ -1804,10 +1804,9 @@ function does not look for the @samp{mode:} local variable in the
 @code{enable-local-variables} into account.
 
 If the optional argument @var{mode-only} is non-@code{nil}, then all
-this function does is return @code{t} if the @w{@samp{-*-}} line
-specifies a mode and @code{nil} otherwise.  It does not set the mode
-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.
+this function does is return @code{t} if the @w{@samp{-*-}} line or
+the local variables list specifies a mode and @code{nil} otherwise.
+It does not set the mode nor any other file local variable.
 @end defun
 
   If a file local variable list could specify a function that would