diff options
| author | Juri Linkov | 2009-07-19 16:57:12 +0000 |
|---|---|---|
| committer | Juri Linkov | 2009-07-19 16:57:12 +0000 |
| commit | 8d9b5eba48fd9961e6d5ca1529daf42b8e9b0a1c (patch) | |
| tree | 3ab2f218ab68c67c6d2f61cb7116d9cf70e01e08 | |
| parent | 2ee20f24e8b7ed14bdb77c8b6f2ee12638f90a9d (diff) | |
| download | emacs-8d9b5eba48fd9961e6d5ca1529daf42b8e9b0a1c.tar.gz emacs-8d9b5eba48fd9961e6d5ca1529daf42b8e9b0a1c.zip | |
(Specifying File Variables, Safe File Variables):
"variables/value pairs" -> "variable/value pairs".
| -rw-r--r-- | doc/emacs/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/emacs/custom.texi | 4 |
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 @@ | |||
| 1 | 2009-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 | |||
| 1 | 2009-07-15 Glenn Morris <rgm@gnu.org> | 6 | 2009-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 |
| 1085 | You can specify any number of variables/value pairs in this way, each | 1085 | You can specify any number of variable/value pairs in this way, each |
| 1086 | pair with a colon and semicolon as shown above. @code{mode: | 1086 | pair 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 |
| 1088 | line. The @var{value}s are not evaluated; they are used literally. | 1088 | line. 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 |
| 1215 | answer @kbd{n}. | 1215 | answer @kbd{n}. |
| 1216 | 1216 | ||
| 1217 | Emacs normally recognizes certain variables/value pairs as safe. | 1217 | Emacs normally recognizes certain variable/value pairs as safe. |
| 1218 | For instance, it is safe to give @code{comment-column} or | 1218 | For 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 |
| 1220 | known-safe variable/value pairs, Emacs does not ask for confirmation | 1220 | known-safe variable/value pairs, Emacs does not ask for confirmation |