* fill-flowed.el: New file.

* mm-decode.el (mm-dissect-singlepart): Create a MIME handle for
text/plain parts with `format' parameters.

* mm-view.el (autoload): Autoload fill-flowed.
(mm-inline-text): For "plain" parts with a format=flowed
parameter, call `fill-flowed'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 387aa9e..6842738 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2000-03-11  Simon Josefsson  <jas@pdc.kth.se>
+
+       * fill-flowed.el: New file.
+
+       * mm-decode.el (mm-dissect-singlepart): Create a MIME handle for
+       text/plain parts with `format' parameters.
+
+       * mm-view.el (autoload): Autoload fill-flowed.
+       (mm-inline-text): For "plain" parts with a format=flowed
+       parameter, call `fill-flowed'.
+
 2000-03-21 10:32:44  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * nnslashdot.el (nnslashdot-request-list): Fudge new-style

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index f5468d1..3a2b0df 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -257,7 +257,9 @@ to:
 
 (defun mm-dissect-singlepart (ctl cte &optional force cdl description id)
   (when (or force
-           (not (equal "text/plain" (car ctl))))
+           (if (equal "text/plain" (car ctl))
+               (assoc 'format ctl)
+             t))
     (let ((res (mm-make-handle
                (mm-copy-to-buffer) ctl cte nil cdl description nil id)))
       (push (car res) mm-dissection-list)

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 5a83983..a5e5030 100644 (file)
--- 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 "fill-flowed")
   (autoload 'diff-mode "diff-mode"))
 
 ;;;
@@ -138,6 +139,14 @@
            (charset (mail-content-type-get
                      (mm-handle-type handle) 'charset)))
        (insert (mm-decode-string text charset))
+       (when (and (equal type "plain")
+                  (equal (cdr (assoc 'format (mm-handle-type handle)))
+                         "flowed"))
+         (save-restriction
+           (narrow-to-region b (point))
+           (goto-char b)
+           (fill-flowed)
+           (goto-char (point-max))))
        (save-restriction
          (narrow-to-region b (point))
          (set-text-properties (point-min) (point-max) nil)