From b345c561829091aec1ad9cd327ca5a97d1050e80 Mon Sep 17 00:00:00 2001 From: Xue Fuqiao Date: Sun, 22 Dec 2013 14:15:17 +0800 Subject: [PATCH] Document `enable-dir-local-variables'. * doc/lispref/variables.texi (Directory Local Variables): Document `enable-dir-local-variables'. --- doc/lispref/ChangeLog | 2 ++ doc/lispref/variables.texi | 6 ++++++ etc/NEWS | 7 +++++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 540ac07bf9f..14facae6ba5 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,5 +1,7 @@ 2013-12-22 Xue Fuqiao + * variables.texi (Directory Local Variables): Document `enable-dir-local-variables'. + * debugging.texi (Debugger Commands): Document `debugger-toggle-locals'. 2013-12-21 Chong Yidong diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi index 866f3774999..941b2d880e4 100644 --- a/doc/lispref/variables.texi +++ b/doc/lispref/variables.texi @@ -1834,6 +1834,12 @@ modification times of the associated directory local variables file updates this list. @end defvar +@defvar enable-dir-local-variables +If @code{nil}, directory-local variables are ignored. This variable +may be useful for modes that want to ignore directory-locals while +still respecting file-local variables (@pxref{File Local Variables}). +@end defvar + @node Variable Aliases @section Variable Aliases @cindex variable aliases diff --git a/etc/NEWS b/etc/NEWS index a6eedaf1b47..0b78a93fa94 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -660,13 +660,13 @@ During initialization, Emacs no longer expends a process to decide whether it is safe to use Bash's --noediting option. These days --noediting is ubiquitous; it was introduced in 1996 in Bash version 2. -*** The SMIE indentation engine is now used by default. - ** Shell Script mode *** `sh-mode' now has the mode own `add-log-current-defun-function'. You can pick the name of the function and the variables with `C-x 4 a'. +*** The SMIE indentation engine is now used by default. + ** SMIE indentation can be customized via `smie-config'. The customization can be guessed by Emacs by providing a sample indented file and letting SMIE learn from it. @@ -745,6 +745,7 @@ received with a pull operation. under current version control system. When called with a prefix argument, you can remove a file from the ignored file list. +--- *** `cvs-append-to-ignore' has been renamed to `vc-cvs-append-to-ignore' because it is moved to vc-cvs.el. @@ -823,6 +824,7 @@ run. The new optional CHECK-TIMERS param allows for the prior behavior. ** The syntax of ?» and ?« is now punctuation instead of matched parens. Some languages match those as »...« and others as «...» so better stay neutral. +--- ** In compiled Lisp files, the header no longer includes a timestamp. ** The default file coding for Emacs Lisp files is now utf-8. @@ -879,6 +881,7 @@ for something (not just adding elements to it), it ought not to affect you. * Lisp Changes in Emacs 24.4 ++++ ** New variable `enable-dir-local-variables'. Directory-local variables are ignored if this is set to nil. This may be useful for modes that want to ignore directory-locals while still -- 2.39.2