(mm-fill-flowed): Add.

(mm-inline-text): Use it.  Tiny patch from Ralf Angeli
<dev.null@iwi.uni-sb.de>.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0f7e27d..413ac43 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-27  Simon Josefsson  <jas@extundo.com>
+
+       * mm-view.el (mm-fill-flowed): Add.
+       (mm-inline-text): Use it.  Tiny patch from Ralf Angeli
+       <dev.null@iwi.uni-sb.de>.
+
 2004-01-27  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * spam.el (spam-spamassassin-register-ham-routine)

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 4cfdf50..12fe02e 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -1,5 +1,5 @@
 ;;; mm-view.el --- functions for viewing MIME objects
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
@@ -64,6 +64,11 @@
     (html2text  html2text))
   "The attributes of washer types for text/html.")
 
+(defcustom mm-fill-flowed t
+  "If non-nil an format=flowed article will be displayed flowed."
+  :type 'boolean
+  :group 'mime-display)
+
 ;;; Internal variables.
 
 ;;;
@@ -345,7 +350,8 @@
          (mm-insert-part handle)
          (goto-char (point-max)))
       (insert (mm-decode-string (mm-get-part handle) charset)))
-    (when (and (equal type "plain")
+    (when (and mm-fill-flowed
+              (equal type "plain")
               (equal (cdr (assoc 'format (mm-handle-type handle)))
                      "flowed"))
       (save-restriction