* custom.texi (Unsafe File Variables): File variable confirmation

	assumed denied in batch mode.

diff --git a/man/ChangeLog b/man/ChangeLog
index f142ed75616fb67e13009118271e77c6b018158a..141115ec00ecb209bc571fb90e71b47fcf529947 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-14  Chong Yidong  <cyd@stupidchicken.com>
+
+       * custom.texi (Unsafe File Variables): File variable confirmation
+       assumed denied in batch mode.
+
 2006-02-14  Richard M. Stallman  <rms@gnu.org>
 
        * building.texi (GDB User Interface Layout): Don't say `inferior'

diff --git a/man/custom.texi b/man/custom.texi
index 5b6dcde70eee87e3f4af794dc95d9b2482cac85a..8c414e6393c4b1ac8c4c22fe25c700c2668cc0ec 100644 (file)
--- a/man/custom.texi
+++ b/man/custom.texi
@@ -1194,6 +1194,9 @@ that file, and asks you for confirmation before setting them.  You can
 type @samp{y} or @samp{SPC} to apply the local variables list, or
 @samp{n} to ignore it.
 
+  When Emacs is run in batch mode (@pxref{Initial Options}), it
+assumes that the answer is @samp{n}.
+
   There is a set of file variables and values that are known to be
 safe.  For instance, it is safe to give @code{comment-column} or
 @code{fill-column} any integer value.  If a file specifies only safe