diff options
Diffstat (limited to 'doc/emacs')
| -rw-r--r-- | doc/emacs/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/emacs/custom.texi | 14 |
2 files changed, 12 insertions, 7 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index b417e806245..d3521dcd524 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,8 @@ +2011-05-10 Glenn Morris <rgm@gnu.org> + + * custom.texi (Specifying File Variables): + Deprecate using mode: for minor modes. + 2011-05-07 Glenn Morris <rgm@gnu.org> * cal-xtra.texi (Sexp Diary Entries): Mention diary-hebrew-birthday. diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index 7a696df319b..d7a99d49d60 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -1085,9 +1085,8 @@ first line: You can specify any number of variable/value pairs in this way, each pair with a colon and semicolon as shown above. The special variable/value pair @code{mode: @var{modename};}, if present, -specifies a major or minor mode; if you use this to specify a major -mode, it should come first in the line. The @var{value}s are used -literally, and not evaluated. +specifies a major mode, and should come first in the line. The +@var{value}s are used literally, and not evaluated. @findex add-file-local-variable-prop-line @findex delete-file-local-variable-prop-line @@ -1186,7 +1185,7 @@ list: @itemize @item -@code{mode} enables the specified major or minor mode. +@code{mode} enables the specified major mode. @item @code{eval} evaluates the specified Lisp expression (the value @@ -1213,10 +1212,11 @@ variables as part of their initialization. You can use the @code{mode} ``variable'' to enable minor modes as well as the major modes; in fact, you can use it more than once, first to set the major mode and then to enable minor modes which are -specific to particular buffers. +specific to particular buffers. Using @code{mode} for minor modes +is deprecated, though---instead, use @code{eval: (minor-mode)}. - Often, however, it is a mistake to enable minor modes this way. -Most minor modes, like Auto Fill mode, represent individual user + Often, however, it is a mistake to enable minor modes in file local +variables. Most minor modes, like Auto Fill mode, represent individual user preferences. If you want to use a minor mode, it is better to set up major mode hooks with your init file to turn that minor mode on for yourself alone (@pxref{Init File}), instead of using a local variable |