[Emacs-diffs] Changes to emacs/lispref/variables.texi

[Richard M. Stallman]

Index: emacs/lispref/variables.texi
diff -u emacs/lispref/variables.texi:1.75 emacs/lispref/variables.texi:1.76
--- emacs/lispref/variables.texi:1.75   Tue Feb 14 20:58:28 2006
+++ emacs/lispref/variables.texi        Wed Feb 15 04:38:45 2006
@@ -1777,14 +1777,12 @@
 measures to prevent this.
 
 @cindex safe local variable
-  A variable can be marked as @dfn{safe} by setting its
+  You can specify safe values for a variable with a
 @code{safe-local-variable} property.  If the property is @code{t},
 setting that variable in a file is always considered safe, regardless
-of the value assigned to it.  The @code{safe-local-variable} property
-can also be a function of one argument.  In that case, Emacs considers
-it safe to give the variable a certain value if the function returns
address@hidden when given that value as argument.  Many
-commonly-encountered file variables standardly have
+of the value used.  If the property is a function of one argument,
+then any value is safe if the function returns address@hidden given
+that value.  Many commonly encountered file variables standardly have
 @code{safe-local-variable} properties, including @code{fill-column},
 @code{fill-prefix}, and @code{indent-tabs-mode}.
 
@@ -1794,10 +1792,11 @@
 where @var{var} is a variable name and @var{val} is a value which is
 safe for that variable.
 
-When Emacs asks the user whether or not to obey a set of file variable
-specifications, the user can choose to mark them as safe.  Doing so
-adds those variable-value pairs to @code{safe-local-variable-values},
-and saves it to the user's custom file.
+When Emacs asks the user whether or not to obey a set of file local
+variable specifications, the user can choose to mark them as safe.
+Doing so adds those variable/value pairs to
address@hidden, and saves it to the user's custom
+file.
 @end defopt
 
 @defun safe-local-variable-p sym val
@@ -1825,8 +1824,8 @@
   If a variable is risky, it will not be entered automatically into
 @code{safe-local-variable-values} as described above.  Therefore,
 Emacs will always query before setting a risky variable, unless the
-user explicitly allows it by editing @code{safe-local-variable-values}
-via Customize.
+user explicitly allows the setting by customizing
address@hidden directly.
 
 @defvar ignored-local-variables
 This variable holds a list of variables that should not be given local