From: yamaoka <yamaoka>
Date: Thu, 23 Oct 2003 05:58:38 +0000 (+0000)
Subject: Synch to Gnus 200310230552.
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6db6f77db5c41bd1fd62e8e4ef7da83ae94fe8a6;p=elisp%2Fgnus.git-

Synch to Gnus 200310230552.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ff7f4f2..6af6877 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+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>
 
 	* gnus-art.el (gnus-emphasis-strikethru): Use the :strike-through
diff --git a/lisp/flow-fill.el b/lisp/flow-fill.el
index c4dcf00..2a0dfa5 100644
--- a/lisp/flow-fill.el
+++ b/lisp/flow-fill.el
@@ -1,6 +1,6 @@
 ;;; flow-fill.el --- interprete RFC2646 "flowed" text
 
-;; Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <jas@pdc.kth.se>
 ;; Keywords: mail
@@ -80,6 +80,7 @@ RFC 2646 suggests 66 characters for readability."
 	'point-at-eol
       'line-end-position)))
 
+;;;###autoload
 (defun fill-flowed-encode (&optional buffer)
   (with-current-buffer (or buffer (current-buffer))
     ;; No point in doing this unless hard newlines is used.
@@ -101,6 +102,7 @@ RFC 2646 suggests 66 characters for readability."
 	  (goto-char (setq start (1+ end)))))
       t)))
 
+;;;###autoload
 (defun fill-flowed (&optional buffer)
   (save-excursion
     (set-buffer (or (current-buffer) buffer))
diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index ec59348..21a660b 100644
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -33,7 +33,6 @@
   (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 aec7b0c..cea42eb 100644
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -37,7 +37,6 @@
   (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