From: Alan Mackenzie <acm@muc.de>
Date: Sat, 5 Dec 2009 20:45:39 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-23.1.90~61
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8fea6b333da8cf55597930215ac00480b20f1266;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3e5a9875a2f..d6b22e02e6d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2009-12-05  Alan Mackenzie  <acm@muc.de>
+
+	* progmodes/cc-mode.el (c-before-hack-hook)
+	(c-postprocess-file-styles): Revert change 2009-07-18T21:03:43Z!acm@muc.de to permit
+	`c-file-style' to work again.  This reversion restores the current
+	software to its state in Emacs 23.1.
+
 2009-12-05  Kevin Ryde  <user42@zip.com.au>
 
 	* textmodes/sgml-mode.el (sgml-lexical-context): Recognise