Synch to No Gnus 200408181228.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 79f92a5..919d024 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-18  Florian Weimer  <fw@deneb.enyo.de>
+
+       * gnus-sum.el (gnus-summary-force-verify-and-decrypt): Bind
+       `mm-fill-flowed'.
+
+       * mm-decode.el (mm-dissect-singlepart): Check it.
+
 2004-08-17  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * nnimap.el (nnimap-open-connection): add 'imaps' synonym to

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index daf7273..4ac59fb 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -7151,6 +7151,7 @@ be displayed."
   (let ((mm-verify-option 'known)
        (mm-decrypt-option 'known)
        (gnus-article-emulate-mime t)
+       (mm-fill-flowed nil)
        (gnus-buttonized-mime-types (append (list "multipart/signed"
                                                  "multipart/encrypted")
                                            gnus-buttonized-mime-types)))

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index 8c0f413..3931d55 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -574,7 +574,11 @@ Postpone undisplaying of viewers for types in
 (defun mm-dissect-singlepart (ctl cte &optional force cdl description id)
   (when (or force
            (if (equal "text/plain" (car ctl))
-               (assoc 'format ctl)
+               ;; FIXME: This is a kludge.  Proper fix is to make
+               ;; gnus-display-mime invoke mm-uu-dissect on all
+               ;; textual MIME parts, and stop using mm-fill-flowed
+               ;; here.
+               (and mm-fill-flowed (assoc 'format ctl))
              t))
     (mm-make-handle
      (mm-copy-to-buffer) ctl cte nil cdl description nil id)))