*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2ebcdd82eeefb653067670ba4ea3ddddd4171162..5b6f51273a4e005387e8fb8d0b04bbe88748223c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,16 @@
 2009-07-18  Alan Mackenzie  <acm@muc.de>
 
+       * progmodes/cc-mode.el (c-before-hack-hook),
+       (c-postprocess-file-styles): Give invocation of `c-set-style'
+       DONT-OVERRIDE parameter of t.  Already set style variables will
+       thus not be overridden by style settings given by `c-file-syle'.
+
+       * files.el (hack-local-variables-filter): Remove entries with
+       duplicate keys from `file-local-variables-alist'.
+
        * files.el (set-auto-mode): (setq name) -> (setq name nil).
 
+       
 2009-07-18  Chong Yidong  <cyd@stupidchicken.com>
 
        * simple.el (region-active-p, use-region-p): Doc fix (Bug#3873).