aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2009-07-19 16:57:12 +0000
committerJuri Linkov2009-07-19 16:57:12 +0000
commit8d9b5eba48fd9961e6d5ca1529daf42b8e9b0a1c (patch)
tree3ab2f218ab68c67c6d2f61cb7116d9cf70e01e08
parent2ee20f24e8b7ed14bdb77c8b6f2ee12638f90a9d (diff)
downloademacs-8d9b5eba48fd9961e6d5ca1529daf42b8e9b0a1c.tar.gz
emacs-8d9b5eba48fd9961e6d5ca1529daf42b8e9b0a1c.zip
(Specifying File Variables, Safe File Variables):
"variables/value pairs" -> "variable/value pairs".
-rw-r--r--doc/emacs/ChangeLog5
-rw-r--r--doc/emacs/custom.texi4
2 files changed, 7 insertions, 2 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index b182057ffe8..ae65a9641a6 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
12009-07-19 Juri Linkov <juri@jurta.org>
2
3 * custom.texi (Specifying File Variables, Safe File Variables):
4 "variables/value pairs" -> "variable/value pairs".
5
12009-07-15 Glenn Morris <rgm@gnu.org> 62009-07-15 Glenn Morris <rgm@gnu.org>
2 7
3 * misc.texi (Gnus): Remove widow. 8 * misc.texi (Gnus): Remove widow.
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index f0a63855f2d..9295d97b1cb 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -1082,7 +1082,7 @@ first line:
1082@end example 1082@end example
1083 1083
1084@noindent 1084@noindent
1085You can specify any number of variables/value pairs in this way, each 1085You can specify any number of variable/value pairs in this way, each
1086pair with a colon and semicolon as shown above. @code{mode: 1086pair with a colon and semicolon as shown above. @code{mode:
1087@var{modename};} specifies the major mode; this should come first in the 1087@var{modename};} specifies the major mode; this should come first in the
1088line. The @var{value}s are not evaluated; they are used literally. 1088line. The @var{value}s are not evaluated; they are used literally.
@@ -1214,7 +1214,7 @@ effect, or @kbd{n} to ignore it. When Emacs is run in batch mode
1214(@pxref{Initial Options}), it can't really ask you, so it assumes the 1214(@pxref{Initial Options}), it can't really ask you, so it assumes the
1215answer @kbd{n}. 1215answer @kbd{n}.
1216 1216
1217 Emacs normally recognizes certain variables/value pairs as safe. 1217 Emacs normally recognizes certain variable/value pairs as safe.
1218For instance, it is safe to give @code{comment-column} or 1218For instance, it is safe to give @code{comment-column} or
1219@code{fill-column} any integer value. If a file specifies only 1219@code{fill-column} any integer value. If a file specifies only
1220known-safe variable/value pairs, Emacs does not ask for confirmation 1220known-safe variable/value pairs, Emacs does not ask for confirmation