Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 615-621)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 197-199)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-166

5 files changed, 38 insertions, 7 deletions

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index bb944e2879a..de524bc6500 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,19 @@
+2007-01-29  Eli Zaretskii  <eliz@gnu.org>
+
+        * elisp.texi (Top): Add "Standard Errors", "Standard Buffer-Local
+        Variables", and "Standard Keymaps" to the detailed menu.
+
+        * variables.texi (Future Local Variables): Add index entry.
+
+2007-01-28  Richard Stallman  <rms@gnu.org>
+
+        * tips.texi (Coding Conventions): Clarify the tip about macros
+        that define a function or a variable.
+
+        * files.texi (File Attributes): UID and GID can be floats.
+        (Magic File Names): Explain why deferring all operations to
+        the standard handler does not work.
+
 2007-01-23  Martin Rudalics  <rudalics@gmx.at>
 
         * backups.texi (Reverting): Use "buffer" instead of "file"
diff --git a/lispref/elisp.texi b/lispref/elisp.texi
index b3486fb5c8d..9bbe806033c 100644
--- a/lispref/elisp.texi
+++ b/lispref/elisp.texi
@@ -365,6 +365,7 @@ Errors
 * Processing of Errors::    What Emacs does when you report an error.
 * Handling Errors::         How you can trap errors and continue execution.
 * Error Symbols::           How errors are classified for trapping them.
+* Standard Errors::         List of all error symbols.
 
 Variables
 
@@ -386,6 +387,8 @@ Variables
 * Variable Aliases::        Variables that are aliases for other variables.
 * Variables with Restricted Values::  Non-constant variables whose value can
                                         @emph{not} be an arbitrary Lisp object.
+* Standard Buffer-Local Variables::
+                            List of variables buffer-local in all buffers.
 
 Scoping Rules for Variable Bindings
 
@@ -617,8 +620,9 @@ Keymaps
 * Remapping Commands::          A keymap can translate one command to another.
 * Key Binding Commands::        Interactive interfaces for redefining keys.
 * Scanning Keymaps::            Looking through all keymaps, for printing help.
-* Menu Keymaps::                A keymap can define a menu for X
-                                  or for use from the terminal.
+* Menu Keymaps::                A keymap can define a menu for X
+                                  or for use from the terminal.
+* Standard Keymaps::            List of standard keymaps.
 
 Major and Minor Modes
 
diff --git a/lispref/files.texi b/lispref/files.texi
index 630eaca9c2a..f13888197c7 100644
--- a/lispref/files.texi
+++ b/lispref/files.texi
@@ -1157,11 +1157,12 @@ links, can be created by using the @code{add-name-to-file} function
 (@pxref{Changing Files}).
 
 @item
-The file's @acronym{UID} as a string or an integer.  If a string
-value cannot be looked up, the integer value is returned.
+The file's @acronym{UID}, normally as a string.  However, if it does
+not correspond to a named user, the value is an integer or a floating
+point number.
 
 @item
-The file's @acronym{GID} likewise.
+The file's @acronym{GID}, likewise.
 
 @item
 The time of last access, as a list of two integers.
@@ -2554,7 +2555,7 @@ whose match starts last in the file name gets precedence.  This rule
 is chosen so that handlers for jobs such as uncompression are handled
 first, before handlers for jobs such as remote file access.
 
-Here are the operations that a magic file name handler gets to handle:
+  Here are the operations that a magic file name handler gets to handle:
 
 @ifnottex
 @noindent
@@ -2704,6 +2705,14 @@ avoids inefficiency, but its main purpose is for autoloaded handler
 functions, so that they won't be loaded except when they have real
 work to do.
 
+  Simply deferring all operations to the usual primitives does not
+work.  For instance, if the file name handler applies to
+@code{file-exists-p}, then it must handle @code{load} itself, because
+the usual @code{load} code won't work properly in that case.  However,
+if the handler uses the @code{operations} property to say it doesn't
+handle @code{file-exists-p}, then it need not handle @code{load}
+nontrivially.
+
 @defvar inhibit-file-name-handlers
 This variable holds a list of handlers whose use is presently inhibited
 for a certain operation.
diff --git a/lispref/tips.texi b/lispref/tips.texi
index 331f0799e4b..5f4479a5fd3 100644
--- a/lispref/tips.texi
+++ b/lispref/tips.texi
@@ -210,7 +210,8 @@ Constructs that define a function or variable should be macros,
 not functions, and their names should start with @samp{def}.
 
 @item
-Macros that define a function or variable should take the name to be
+A macro that defines a function or variable should have a name that
+starts with @samp{define-}.  The macro should receive the name to be
 defined as the first argument.  That will help various tools find the
 definition automatically.  Avoid constructing the names in the macro
 itself, since that would confuse these tools.
diff --git a/lispref/variables.texi b/lispref/variables.texi
index 7a2b2013b23..8d3e0bb5c25 100644
--- a/lispref/variables.texi
+++ b/lispref/variables.texi
@@ -1644,6 +1644,7 @@ local bindings, we will provide it in a subsequent Emacs version.
 
 @node File Local Variables
 @section File Local Variables
+@cindex file local variables
 
   A file can specify local variable values; Emacs uses these to create
 buffer-local bindings for those variables in the buffer visiting that