Synch to No Gnus 200511172246.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 15b6571..6b92392 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * flow-fill.el (fill-flowed): Bind adaptive-fill-mode to nil. 
+
 2005-11-16  Boris Samorodov <bsam@ipt.ru>  (tiny patch)
 
        * imap.el (imap-kerberos4-open): Ignore SSL stuff.

diff --git a/lisp/flow-fill.el b/lisp/flow-fill.el
index 6ffe891..ffc3862 100644 (file)
--- a/lisp/flow-fill.el
+++ b/lisp/flow-fill.el
@@ -140,7 +140,8 @@ RFC 2646 suggests 66 characters for readability."
            (condition-case nil
                (let ((fill-prefix (when quote (concat quote " ")))
                      (fill-column (eval fill-flowed-display-column))
-                     filladapt-mode)
+                     filladapt-mode
+                     adaptive-fill-mode)
                  (fill-region (point-at-bol)
                               (min (1+ (point-at-eol))
                                    (point-max))