(regexp-opt-group): Compute HALF2 properly.

[gnu-emacs] / lispref / variables.texi

diff --git a/lispref/variables.texi b/lispref/variables.texi
index c45599a92b669fc3c82b4f3e63fed3d5c111091f..48003e0977aec6fcd515d431645f05078a2334c0 100644 (file)
--- a/lispref/variables.texi
+++ b/lispref/variables.texi
@@ -1676,7 +1676,7 @@ chosen, or because its meaning has partly changed---it can be useful
 to keep the old name as an @emph{alias} of the new one for
 compatibility.  You can do this with @code{defvaralias}.
 
-@defmac defvaralias alias-var base-var [docstring]
+@defun defvaralias alias-var base-var [docstring]
 This function defines the symbol @var{alias-var} as a variable alias
 for symbol @var{base-var}. This means that retrieving the value of
 @var{alias-var} returns the value of @var{base-var}, and changing the
@@ -1685,7 +1685,7 @@ value of @var{alias-var} changes the value of @var{base-var}.
 If the @var{docstring} argument is present, it specifies the documentation for
 @var{alias-var}; otherwise, it has the same documentation as @var{base-var},
 if any.
-@end defmac
+@end defun
 
 @defun indirect-variable variable
 This function returns the variable at the end of the chain of aliases
@@ -1733,20 +1733,25 @@ The argument @var{force} usually comes from the argument @var{find-file}
 given to @code{normal-mode}.
 @end defun
 
-  If a file local variable list could specify the a function that will
+  If a file local variable list could specify a function that will
 be called later, or an expression that will 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.
 
-  For one thing, any variable whose name ends in @samp{-function},
-@samp{-functions}, @samp{-hook}, @samp{-hooks}, @samp{-form},
-@samp{-forms}, @samp{-program}, @samp{-command} or @samp{-predicate}
-cannot be set in a local variable list.  In general, you should use such
-a name whenever it is appropriate for the variable's meaning.
+  For one thing, any variable whose name ends in @samp{-command},
+@samp{-frame-alist}, @samp{-function}, @samp{-functions},
+@samp{-hook}, @samp{-hooks}, @samp{-form}, @samp{-forms}, @samp{-map},
+@samp{-map-alist}, @samp{-mode-alist}, @samp{-program}, or
+@samp{-predicate} cannot be set in a local variable list.  In general,
+you should use such a name whenever it is appropriate for the
+variable's meaning.  The variables @samp{font-lock-keywords},
+@samp{font-lock-keywords-[0-9]}, and
+@samp{font-lock-syntactic-keywords} cannot be set in a local variable
+list, either.
 
   In addition, any variable whose name has a non-@code{nil}
-@code{risky-local-variable} property is also ignored.  So are
-all variables listed in @code{ignored-local-variables}:
+@code{risky-local-variable} property is also ignored.  So are all
+variables listed in @code{ignored-local-variables}:
 
 @defvar ignored-local-variables
 This variable holds a list of variables that should not be
@@ -1754,6 +1759,10 @@ set by a file's local variables list.  Any value specified
 for one of these variables is ignored.
 @end defvar
 
+@defun risky-local-variable-p sym
+Returns non-nil if @var{sym} is risky for any of the reasons stated above.
+@end defun
+
   The @samp{Eval:} ``variable'' is also a potential loophole, so Emacs
 normally asks for confirmation before handling it.