2001-07-28 09:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>

	* message.el (message-fill-paragraph): Do nothing if the user
	wants filladapt-mode.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 32c0eaa..f94bdb5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-28 09:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * message.el (message-fill-paragraph): Do nothing if the user
+       wants filladapt-mode.
+
 2001-07-27 23:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * mm-decode.el (mm-image-type-from-buffer): New.

diff --git a/lisp/lpath.el b/lisp/lpath.el
index a0d2a6c..5171603 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -35,6 +35,7 @@
              adaptive-fill-regexp babel-history babel-translations
              default-enable-multibyte-characters
              display-time-mail-function imap-password mail-mode-hook
+             filladapt-mode
              mc-pgp-always-sign
              nnoo-definition-alist
              url-current-callback-func url-be-asynchronous

diff --git a/lisp/message.el b/lisp/message.el
index d691ec9..eb33320 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1916,8 +1916,10 @@ Prefix arg means justify as well."
 (defun message-fill-paragraph (&optional arg)
   "Like `fill-paragraph'."
   (interactive (list (if current-prefix-arg 'full)))
-  (message-newline-and-reformat arg t)
-  t)
+  (if (and (boundp 'filladapt-mode) filladapt-mode)
+      nil
+    (message-newline-and-reformat arg t)
+    t))
 
 (defun message-insert-signature (&optional force)
   "Insert a signature.  See documentation for variable `message-signature'."