From: Alan Mackenzie <acm@muc.de>
Date: Sun, 17 Dec 2006 22:13:41 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.92~57
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bce4aeb40ade40ad5b2df215c9085e499c7b6d17;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bd8f9b34379..58a21c55c68 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-17  Alan Mackenzie  <acm@muc.de>
+
+	* progmodes/cc-mode.el (c-basic-common-init): don't set
+	open-paren-in-column-0-is-defun-start to nil any more.
+
 2006-12-17  Richard Stallman  <rms@gnu.org>
 
 	* files.el (magic-mode-alist): Mark as risky.
diff --git a/man/ChangeLog b/man/ChangeLog
index 3884038f32e..a0a613ed350 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-17  Alan Mackenzie  <acm@muc.de>
+
+	* programs.texi (Left Margin Paren): Remove the bit which says
+	that CC Mode sets open-paren-in-column-0-is-defun-start to nil.
+	Discuss some of the issues of setting this option to nil.
+
 2006-12-17  Glenn Morris  <rgm@gnu.org>
 
 	* abbrevs.texi (Editing Abbrevs): Mention system abbrevs.