summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Mackenzie <acm@muc.de>2009-07-18 21:00:48 +0000
committerAlan Mackenzie <acm@muc.de>2009-07-18 21:00:48 +0000
commit9dae80a8105a3fc0bb05ec761cc4b63909e24f7c (patch)
treef81dcc66f625f1eeb4e758fe2a3e12e2f678140c
parenta54372ae521a819a647d683748db3e668fa2e517 (diff)
downloademacs-9dae80a8105a3fc0bb05ec761cc4b63909e24f7c.tar.gz
*** empty log message ***
-rw-r--r--lisp/ChangeLog9
1 files changed, 9 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2ebcdd82eee..5b6f51273a4 100644
--- 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).