# HG changeset patch
# User Juri Linkov <juri@jurta.org>
# Date 1248022582 0
# Node ID 43559a8aeabb4076931f713551d41da93cd34c1f
# Parent  4af91568dcc6e79386c3d0d492044f8ed60411d7
*** empty log message ***

diff -r 4af91568dcc6 -r 43559a8aeabb lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Jul 19 16:56:05 2009 +0000
+++ b/lisp/ChangeLog	Sun Jul 19 16:56:22 2009 +0000
@@ -1,3 +1,18 @@
+2009-07-19  Juri Linkov  <juri@jurta.org>
+
+	* files.el (ignored-local-variables): Add `dir-local-variables-alist'.
+	(dir-local-variables-alist): New buffer-local variable.
+	(hack-local-variables-filter): If variable is not dir-local,
+	i.e. `dir-name' is nil, then remove it from `dir-local-variables-alist',
+	because file-local overrides dir-local.
+	(c-postprocess-file-styles)<declare-function>:
+	Remove obsolete declaration.
+	(hack-dir-local-variables): Add dir-local variable/value pair to
+	`dir-local-variables-alist' and remove duplicates.  Doc fix.
+
+	* help-fns.el (describe-variable): Add information about
+	file-local and dir-local variables.
+
 2009-07-19  Chong Yidong  <cyd@stupidchicken.com>
 
 	* files.el (hack-local-variables-filter): Rewrite.