[Emacs-diffs] emacs/lisp ChangeLog

[Alan Mackenzie]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Alan Mackenzie <acmacm> 09/07/18 20:40:44

Modified files:
        lisp           : ChangeLog 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15827&r2=1.15828

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15827
retrieving revision 1.15828
diff -u -b -r1.15827 -r1.15828
--- ChangeLog   18 Jul 2009 19:04:22 -0000      1.15827
+++ ChangeLog   18 Jul 2009 20:40:39 -0000      1.15828
@@ -1,3 +1,13 @@
+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'.
+
 2009-07-18  Eli Zaretskii  <address@hidden>
 
        * simple.el (deactivate-mark, activate-mark, set-mark): Don't call