# HG changeset patch
# User Alan Mackenzie <acm@muc.de>
# Date 1247949639 0
# Node ID 484bf5aa1964791d6bbbdcb3263c1059a95fe21f
# Parent  e3d7d5bddad476a96c17eb75e8227fb0eaa379df
*** empty log message ***

diff -r e3d7d5bddad4 -r 484bf5aa1964 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Jul 18 19:14:11 2009 +0000
+++ b/lisp/ChangeLog	Sat Jul 18 20:40:39 2009 +0000
@@ -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