From: yamaoka <yamaoka>
Date: Wed, 17 Mar 2004 14:33:13 +0000 (+0000)
Subject: Synch to No Gnus 200403171404.
X-Git-Tag: t-gnus-6_17_4-quimby-~1010
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71f930a11aca1a252cc29e71c0fb981e06b43328;p=elisp%2Fgnus.git-

Synch to No Gnus 200403171404.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2724906..7d85cd1 100644
--- 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
--- 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"))