*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0db4667..88406f2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+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'.
+
 2009-07-18  Eli Zaretskii  <eliz@gnu.org>
 
        * simple.el (deactivate-mark, activate-mark, set-mark): Don't call