# HG changeset patch
# User Martin Stjernholm <mast@lysator.liu.se>
# Date 1023579522 0
# Node ID deb27e3d41fd3f3b8ab9c18b570398dcaa0cb6bd
# Parent  b022aba47c59033b8107807827607e28b4435bef
*** empty log message ***

diff -r b022aba47c59 -r deb27e3d41fd lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Jun 08 23:37:37 2002 +0000
+++ b/lisp/ChangeLog	Sat Jun 08 23:38:42 2002 +0000
@@ -1,3 +1,9 @@
+2002-06-09  Martin Stjernholm  <bug-cc-mode@gnu.org>
+
+	* progmodes/cc-style.el (c-set-style, c-set-style-1): Added
+	another state for the `dont-override' flag where it only keeps
+	globally set variables.
+
 2002-06-08  Colin Walters  <walters@gnu.org>
 
 	* descr-text.el (describe-text-properties): Sort the output by the