*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bd8f9b343791e4f142ddcb5a644b813c5898142c..58a21c55c68ba261026ef6d63f39c49f96ab6e01 100644 (file)
--- 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 3884038f32e83a37967d20889f8277e3064b5a3b..a0a613ed3509ba94e07f69de6c94dbcf0f0d1190 100644 (file)
--- 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.