From: Alan Mackenzie <acm@muc.de>
Date: Tue, 17 Jan 2012 18:46:02 +0000 (+0000)
Subject: Update the ChangeLog.
X-Git-Tag: emacs-pretest-24.0.93~97^2~16^2~8
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8c82b1b4dcca42c29992a71b3f1c9d3803d74d3a;p=emacs.git

Update the ChangeLog.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fa51e7eb28f..f9628202001 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -40,6 +40,17 @@
 
 	* dired.el (dired-get-filename): Fix 'verbatim case of previous change.
 
+2012-01-13  Alan Mackenzie  <acm@muc.de>
+
+	Fix filling for when filladapt mode is enabled.
+
+	* progmodes/cc-cmds.el (c-fill-paragraph): In the invocation of
+	c-mask-paragraph, pass in `fill-paragraph' rather than
+	`fill-region-as-paragraph'.  (This is a reversion of a previous
+	change.)
+	* progmodes/cc-mode.el (c-basic-common-init): Make
+	fill-paragraph-handle-comment buffer local and set it to nil.
+
 2012-01-13  Glenn Morris  <rgm@gnu.org>
 
 	* dired.el (dired-switches-escape-p): New function.