aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog11
1 files changed, 11 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fa51e7eb28..f962820200 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 <[email protected]>
+
+ 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 <[email protected]>
* dired.el (dired-switches-escape-p): New function.