From: yamaoka <yamaoka>
Date: Thu, 23 Oct 2003 12:18:16 +0000 (+0000)
Subject: Synch to Gnus 200310231215.
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=028b4a278e2bedd321d185fb4db02a1f0875265f;p=elisp%2Fgnus.git-

Synch to Gnus 200310231215.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6af6877..efcd260 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,6 @@
 2003-10-23  Simon Josefsson  <jas@extundo.com>
 
 	* flow-fill.el (fill-flowed-encode, fill-flowed): Autoload.
-	* mml.el: Remove autoload cookie for flow-fill.
-	* mm-view.el: Likewise.
 
 2003-10-22  Katsumi Yamaoka  <yamaoka@jpl.org>
 
diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 21a660b..ec59348 100644
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -33,6 +33,7 @@
   (autoload 'gnus-article-prepare-display "gnus-art")
   (autoload 'vcard-parse-string "vcard")
   (autoload 'vcard-format-string "vcard")
+  (autoload 'fill-flowed "flow-fill")
   (autoload 'html2text "html2text")
   (unless (fboundp 'diff-mode)
     (autoload 'diff-mode "diff-mode" "" t nil)))
diff --git a/lisp/mml.el b/lisp/mml.el
index cea42eb..aec7b0c 100644
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -37,6 +37,7 @@
   (autoload 'gnus-add-minor-mode "gnus-ems")
   (autoload 'gnus-make-local-hook "gnus-util")
   (autoload 'message-fetch-field "message")
+  (autoload 'fill-flowed-encode "flow-fill")
   (autoload 'message-posting-charset "message"))
 
 (defcustom mml-content-type-parameters