[Emacs-diffs] trunk r115686: Document `enable-dir-local-variables'.

[Xue Fuqiao]

------------------------------------------------------------
revno: 115686
revision-id: address@hidden
parent: address@hidden
committer: Xue Fuqiao <address@hidden>
branch nick: trunk
timestamp: Sun 2013-12-22 14:15:17 +0800
message:
  Document `enable-dir-local-variables'.
  
  * doc/lispref/variables.texi (Directory Local Variables): Document 
`enable-dir-local-variables'.
modified:
  doc/lispref/ChangeLog          changelog-20091113204419-o5vbwnq5f7feedwu-6155
  doc/lispref/variables.texi     
variables.texi-20091113204419-o5vbwnq5f7feedwu-6221
  etc/NEWS                       news-20100311060928-aoit31wvzf25yr1z-1

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2013-12-22 03:36:04 +0000
+++ b/doc/lispref/ChangeLog     2013-12-22 06:15:17 +0000
@@ -1,5 +1,7 @@
 2013-12-22  Xue Fuqiao  <address@hidden>
 
+       * variables.texi (Directory Local Variables): Document 
`enable-dir-local-variables'.
+
        * debugging.texi (Debugger Commands): Document `debugger-toggle-locals'.
 
 2013-12-21  Chong Yidong  <address@hidden>

=== modified file 'doc/lispref/variables.texi'
--- a/doc/lispref/variables.texi        2013-08-26 15:28:24 +0000
+++ b/doc/lispref/variables.texi        2013-12-22 06:15:17 +0000
@@ -1834,6 +1834,12 @@
 updates this list.
 @end defvar
 
address@hidden 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}).
address@hidden defvar
+
 @node Variable Aliases
 @section Variable Aliases
 @cindex variable aliases

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2013-12-22 05:57:32 +0000
+++ b/etc/NEWS  2013-12-22 06:15:17 +0000
@@ -660,13 +660,13 @@
 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 @@
 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 @@
 ** 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 @@
 
 * 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