From 10d37df7e232024b86622b57018ea1b5e14e3785 Mon Sep 17 00:00:00 2001
From: Alan Mackenzie <acm@muc.de>
Date: Sat, 18 Jul 2009 20:40:39 +0000
Subject: [PATCH] *** empty log message ***

---
 lisp/ChangeLog | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0db4667693..88406f2462 100644
--- 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
-- 
2.20.1