[Emacs-diffs] emacs/lisp ChangeLog [EMACS_23_1_RC]

[Alan Mackenzie]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         EMACS_23_1_RC
Changes by:     Alan Mackenzie <acmacm> 09/07/18 21:00:58

Modified files:
        lisp           : ChangeLog 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.15702.2.35&r2=1.15702.2.36

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15702.2.35
retrieving revision 1.15702.2.36
diff -u -b -r1.15702.2.35 -r1.15702.2.36
--- ChangeLog   18 Jul 2009 20:13:29 -0000      1.15702.2.35
+++ ChangeLog   18 Jul 2009 21:00:48 -0000      1.15702.2.36
@@ -1,7 +1,16 @@
 2009-07-18  Alan Mackenzie  <address@hidden>
 
+       * 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  <address@hidden>
 
        * simple.el (region-active-p, use-region-p): Doc fix (Bug#3873).