From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/58293 Path: main.gmane.org!not-for-mail From: Florian Weimer Newsgroups: gmane.emacs.gnus.general Subject: Inline PGP and format=flowed Date: Wed, 18 Aug 2004 14:06:13 +0200 Sender: ding-owner@lists.math.uh.edu Message-ID: <87oel8d51m.fsf@deneb.enyo.de> NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1092830880 31338 80.91.224.253 (18 Aug 2004 12:08:00 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Wed, 18 Aug 2004 12:08:00 +0000 (UTC) Original-X-From: ding-owner+M6834@lists.math.uh.edu Wed Aug 18 14:07:48 2004 Return-path: Original-Received: from malifon.math.uh.edu ([129.7.128.13]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1BxPEJ-0003dz-00 for ; Wed, 18 Aug 2004 14:07:48 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu ident=lists) by malifon.math.uh.edu with smtp (Exim 3.20 #1) id 1BxPD1-0003DM-00; Wed, 18 Aug 2004 07:06:27 -0500 Original-Received: from util2.math.uh.edu ([129.7.128.23]) by malifon.math.uh.edu with esmtp (Exim 3.20 #1) id 1BxPCs-0003DE-00 for ding@lists.math.uh.edu; Wed, 18 Aug 2004 07:06:18 -0500 Original-Received: from justine.libertine.org ([66.139.78.221] ident=postfix) by util2.math.uh.edu with esmtp (Exim 4.30) id 1BxPCs-0004LK-JK for ding@lists.math.uh.edu; Wed, 18 Aug 2004 07:06:18 -0500 Original-Received: from mail.enyo.de (mail.enyo.de [212.9.189.167]) by justine.libertine.org (Postfix) with ESMTP id A0CEC3A003F for ; Wed, 18 Aug 2004 07:06:17 -0500 (CDT) Original-Received: (debugging) helo=deneb.enyo.de ip=212.9.189.171 name=deneb.enyo.de Original-Received: from deneb.enyo.de ([212.9.189.171]) by mail.enyo.de with esmtp id 1BxPCo-0004Xr-GO for ding@gnus.org; Wed, 18 Aug 2004 14:06:14 +0200 Original-Received: from fw by deneb.enyo.de with local (Exim 4.34) id 1BxPCn-0002DV-AH for ding@gnus.org; Wed, 18 Aug 2004 14:06:13 +0200 Original-To: ding@gnus.org Precedence: bulk Xref: main.gmane.org gmane.emacs.gnus.general:58293 X-Report-Spam: http://spam.gmane.org/gmane.emacs.gnus.general:58293 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 * 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)))