Synch to No Gnus 200403171404.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2724906..7d85cd1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-17  Jesper Harder  <harder@ifa.au.dk>
+
+       * mml.el (mml-generate-mime-1): Don't use format=flowed with
+       inline PGP.
+
 2004-03-17  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-agent.el (gnus-agent-regenerate-group): Activate the group

diff --git a/lisp/mml.el b/lisp/mml.el
index 477e6e3..3199a0d 100644 (file)
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -442,6 +442,7 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
                    ;; actually are hard newlines in the text.
                    (let (use-hard-newlines)
                      (when (and (string= type "text/plain")
+                                (not (string= (cdr (assq 'sign cont)) "pgp"))
                                 (or (null (assq 'format cont))
                                     (string= (cdr (assq 'format cont))
                                              "flowed"))