Mercurial > emacs

changeset 103964:484bf5aa1964

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Alan Mackenzie <acm@muc.de>
date Sat, 18 Jul 2009 20:40:39 +0000
parents e3d7d5bddad4
children 73a2130eb104
files lisp/ChangeLog
diffstat 1 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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