(c-basic-common-init): Install `c-fill-paragraph' on

`fill-paragraph-function'.  Although it's not the normal way to call
it in a CC Mode buffer it makes a direct call to `fill-paragraph' work
better.

2 files changed, 13 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d2511614896..888157367c6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2003-02-09  Martin Stjernholm  <mast@lysator.liu.se>
+
+        * progmodes/cc-mode.el (c-basic-common-init): Install
+        `c-fill-paragraph' on `fill-paragraph-function'.  Although
+        it's not the normal way to call it in a CC Mode buffer it
+        makes a direct call to `fill-paragraph' work better.
+
 2003-02-08  Kim F. Storm  <storm@cua.dk>
 
         * printing.el (pr-get-symbol): Define during compile.
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 2073a4a3371..94eb6fcaea4 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -335,6 +335,12 @@
         comment-start-skip "/\\*+ *\\|//+ *"
         comment-multi-line t)
 
+  ;; Install `c-fill-paragraph' on `fill-paragraph-function' so that a
+  ;; direct call to `fill-paragraph' behaves better.  This still
+  ;; doesn't work with filladapt but it's better than nothing.
+  (make-local-variable 'fill-paragraph-function)
+  (setq fill-paragraph-function 'c-fill-paragraph)
+
   ;; Set `require-final-newline' only if we should.
   (let ((rfn (assq mode c-require-final-newline)))
     (when rfn