Inline PGP and format=flowed

Inline PGP and format=flowed

[Florian Weimer]

If a message contains a text/plain part with format=flowed (actually,
the format parameter suffices), `mm-dissect' creates a MIME handle,
which prevents `mm-uu-dissect' from being called by
`gnus-display-mime'.  (`mm-uu-dissect' normally handles inline PGP
processing.)

Is the following okay to commit?  Of course, it's a klugde.  Another
way to fix it would be to change `gnus-display-mime' to invoke
`mm-uu-dissect' if the passed MIME handles contain only one text/plain
part.

Comments?

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.

Index: gnus-sum.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/gnus-sum.el,v
retrieving revision 7.41
diff -u -r7.41 gnus-sum.el
--- gnus-sum.el	6 Aug 2004 14:59:16 -0000	7.41
+++ gnus-sum.el	18 Aug 2004 11:58:46 -0000
@@ -7146,6 +7146,7 @@
   (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)))
Index: mm-decode.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/mm-decode.el,v
retrieving revision 7.10
diff -u -r7.10 mm-decode.el
--- mm-decode.el	9 Jul 2004 09:45:45 -0000	7.10
+++ mm-decode.el	18 Aug 2004 11:58:46 -0000
@@ -574,7 +574,7 @@
 (defun mm-dissect-singlepart (ctl cte &optional force cdl description id)
   (when (or force
 	    (if (equal "text/plain" (car ctl))
-		(assoc 'format ctl)
+		(and mm-fill-flowed (assoc 'format ctl))
 	      t))
     (mm-make-handle
      (mm-copy-to-buffer) ctl cte nil cdl description nil id)))

Re: Inline PGP and format=flowed

[Simon Josefsson]

Florian Weimer <fw@deneb.enyo.de> writes:

> If a message contains a text/plain part with format=flowed (actually,
> the format parameter suffices), `mm-dissect' creates a MIME handle,
> which prevents `mm-uu-dissect' from being called by
> `gnus-display-mime'.  (`mm-uu-dissect' normally handles inline PGP
> processing.)
>
> Is the following okay to commit?

I'd say yes, but please add a comment before the code in mm-decode.el:

;; 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.