From unknown Sun Jun 22 07:55:29 2025 X-Loop: help-debbugs@gnu.org Subject: bug#39230: [PATCH] Expand text/html regardless of it position in the MIME tree Resent-From: Jeremy Compostella Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 21 Jan 2020 23:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 39230 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: 39230@debbugs.gnu.org X-Debbugs-Original-To: Received: via spool by submit@debbugs.gnu.org id=B.157964771820014 (code B ref -1); Tue, 21 Jan 2020 23:02:02 +0000 Received: (at submit) by debbugs.gnu.org; 21 Jan 2020 23:01:58 +0000 Received: from localhost ([127.0.0.1]:48672 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iu2Wv-0005Cc-7X for submit@debbugs.gnu.org; Tue, 21 Jan 2020 18:01:58 -0500 Received: from lists.gnu.org ([209.51.188.17]:43968) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iu2Wo-0005CP-JU for submit@debbugs.gnu.org; Tue, 21 Jan 2020 18:01:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55681) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iu2Wn-0004lo-9i for bug-gnu-emacs@gnu.org; Tue, 21 Jan 2020 18:01:46 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iu2Wm-0002BE-4T for bug-gnu-emacs@gnu.org; Tue, 21 Jan 2020 18:01:45 -0500 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]:40943) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iu2Wl-00029R-Uq for bug-gnu-emacs@gnu.org; Tue, 21 Jan 2020 18:01:44 -0500 Received: by mail-pl1-x62e.google.com with SMTP id s21so1997932plr.7 for ; Tue, 21 Jan 2020 15:01:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:organization:date:message-id:mime-version; bh=LmNhniIxMM3BgPPV+Y1VEGkOE46KS9IC10YIG4VGzyc=; b=cqPwc13m5B1LFP3fgC32HJkefwpX/hnbODoizQBa1Kq7+wa4Auh1lG5bKSHaWuWD+M n/ceP5Tr5WNT0NOCQoJb7B4gKRlhwYNrbhUM3avZZA5QXINkCXfvxyXKU3Reg4nOPvhS sZyAgtrphN1zzz8Aw7kj4+JHc5pZegCxrpOIrLl91OZ0SrX+RpkRW0XsNL2txEWbZaIs bVSv4bKf/n+mPJ5ztVggF3I02HYm2eBKGbp2hLBY6cAD4KikxTsvMIrWCczEjUYu2nsM wcK13eY298UuwNfbfRRzBPmSZCJ71am4HaR+exDrBuusk2GpTJ0oNek/7SR+uNC0wghm MbNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:organization:date:message-id :mime-version; bh=LmNhniIxMM3BgPPV+Y1VEGkOE46KS9IC10YIG4VGzyc=; b=jfpz4YEk724imZR8vDZMfAB3iRVkT+pqJTY0PKlgrQpGbGGiFiUV4gCUgD1yncnnRJ 2It/JgQMCWMHBhtJdVPl1BuPguNeqSVQuA8GHDTlBaRbxHuxtzfkOPgivSTDkA3yfgqU /y94fQeEL7RNewwMt1wvtv+tQRrXEsfiQdoxnr18uz++VlLwbZeJIvrMrc1dK4p8Fw66 JVneXj8R0VGtthfniQtdWmAg8S40VwlML6YSclecAC2IsRRmziJcORUh22mQU0pookc/ 2XkyuLOoK1hcz3Q6UWYKjn05E9TKcjR+tfX++nZN6YK1gzP9e6qIJUKS4xQFqoqK6Oaw 6czg== X-Gm-Message-State: APjAAAXjKTn3deVYIbE8BEkafhWGwNbzueYgldCyppOuPx0usCdPYF4x jlYYovTx3O4vD43Y6fYPs0c= X-Google-Smtp-Source: APXvYqxdjtzHmSjKQBdUVINvUQ+2RdJVy3h9ravDGh56YQPpnAwpdv6dBqv2K9L4otkKecIokxlYZg== X-Received: by 2002:a17:90b:3cc:: with SMTP id go12mr864483pjb.89.1579647702419; Tue, 21 Jan 2020 15:01:42 -0800 (PST) Received: from jcompost-mobl.ch.intel.com (fmdmzpr04-ext.fm.intel.com. [192.55.55.39]) by smtp.gmail.com with ESMTPSA id w11sm41813844pgs.60.2020.01.21.15.01.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jan 2020 15:01:41 -0800 (PST) From: Jeremy Compostella Organization: Intel Corportation - 2200 Mission College Blvd. Santa Clara, CA 95052. USA Date: Tue, 21 Jan 2020 16:01:40 -0700 Message-ID: <878sm05s8b.fsf@jcompost-mobl.ch.intel.com> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::62e X-Spam-Score: 0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) If the text/html part is not the unique part of the email, mml-generate-mime does not expand it to a related multipart. This break uses cases like PGP signing of an HTML email including images. For instance, if you compose an email with the and a , the second part is not expanded into a multipart related and the images are not included. Signed-off-by: Jeremy Compostella --- lisp/gnus/mml.el | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el index cdd8f3d3a5..3d86c5bc40 100644 --- a/lisp/gnus/mml.el +++ b/lisp/gnus/mml.el @@ -487,11 +487,8 @@ type detected." (= (length cont) 1) content-type) (setcdr (assq 'type (cdr (car cont))) content-type)) - (when (and (consp (car cont)) - (= (length cont) 1) - (fboundp 'libxml-parse-html-region) - (equal (cdr (assq 'type (car cont))) "text/html")) - (setq cont (mml-expand-html-into-multipart-related (car cont)))) + (when (fboundp 'libxml-parse-html-region) + (setq cont (mapcar 'mml-expand-all-html-into-multipart-related cont))) (prog1 (with-temp-buffer (set-buffer-multibyte nil) @@ -510,6 +507,18 @@ type detected." (buffer-string)) (setq message-options options))))) +(defun mml-expand-all-html-into-multipart-related (cont) + (cond ((and (eq (car cont) 'part) + (equal (cdr (assq 'type cont)) "text/html")) + (mml-expand-html-into-multipart-related cont)) + ((eq (car cont) 'multipart) + (let ((cur (cdr cont))) + (while (consp cur) + (setcar cur (mml-expand-all-html-into-multipart-related (car cur))) + (setf cur (cdr cur)))) + cont) + (t cont))) + (defun mml-expand-html-into-multipart-related (cont) (let ((new-parts nil) (cid 1)) -- 2.24.1 From unknown Sun Jun 22 07:55:29 2025 X-Loop: help-debbugs@gnu.org Subject: bug#39230: [PATCH] Expand text/html regardless of it position in the MIME tree Resent-From: =?UTF-8?Q?J=C3=A9r=C3=A9my?= Compostella Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 12 Feb 2020 18:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39230 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: 39230@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158153150628054 (code B ref -1); Wed, 12 Feb 2020 18:19:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 Feb 2020 18:18:26 +0000 Received: from localhost ([127.0.0.1]:59018 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j1waf-0007IO-NP for submit@debbugs.gnu.org; Wed, 12 Feb 2020 13:18:26 -0500 Received: from lists.gnu.org ([209.51.188.17]:43678) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j1wae-0007IF-26 for submit@debbugs.gnu.org; Wed, 12 Feb 2020 13:18:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52202) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j1wac-0000yQ-7i for bug-gnu-emacs@gnu.org; Wed, 12 Feb 2020 13:18:23 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, HTML_MESSAGE autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j1waa-0004Hg-Dr for bug-gnu-emacs@gnu.org; Wed, 12 Feb 2020 13:18:22 -0500 Received: from mail-io1-xd44.google.com ([2607:f8b0:4864:20::d44]:43512) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j1waa-0004GL-5c for bug-gnu-emacs@gnu.org; Wed, 12 Feb 2020 13:18:20 -0500 Received: by mail-io1-xd44.google.com with SMTP id n21so3309003ioo.10 for ; Wed, 12 Feb 2020 10:18:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=8LNLaceRTFQ+AOQy+oWQh7IRv56Z5+qsVphMUzv0WZg=; b=cNkn42EZL12dl/8AuIE0bjApSTuBFQF1Y15t3V9Yy6Hij1qNiauhvJpMBuCzlPLhHQ GQfVXMFr228+T4aMfMb6iAByf/YPsKZ6Yu7ZCPgr1IVFwh2B6UhpdhOu41tF8sJBzWHF 4GRHZBl8HSEV/m0g52X92fwZCk2ziq/2a+yMAV5ItdGUYFX9NcAlEryjtnF7YNH4xlfV 9JCj+cWUE/cmU1DassB6SDhZOSN1ZAQrS9mVR77NQ/G7f3P8HUz3roHOiZc6KAbaKQP4 NluqqRm2AJQxhvwHWsRizlv6cpU+cmu8bR+AVcEn1kXGye+KdhR1Gc113+4UHVYYwigM vuEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=8LNLaceRTFQ+AOQy+oWQh7IRv56Z5+qsVphMUzv0WZg=; b=Qca0taFmBUJ0XZdlJt1rT0Zm2mEM7g8bEGcgBsotVCeqB7Buo4zPGgP+SC4SLQIdKd PCWMZW2dE0kTP0rH612ef4sPKIR5fby6rCtmXMAxNsH73LzIiOHf/jLWvmKGk9kJuUJd jhOLZTZWuk3cqY2AKTzT5EnYqJ/0lnI4IPMYX6l6uK6MR0gYuH8UA9AhLrJS8Kz5PqG4 tP8iwoaKMNzFjfPp38dZGDoFA3NhqKITrHC3FEWSiILDoO0RMoeolIYo/qRyMbagZN79 9YEKtlOFo2DgoIrN7djkrrRZ8VV9ndoq3gcM3IQQ5GghY8OfZeULp88D96duxluizlic jQTA== X-Gm-Message-State: APjAAAWChE3BQP+LH0lIpd7UFR7801eWzDRg7f/HLXT90KGp15VAIsID E8DVWMzOlCVy++INEivW/rIM6U1u91jOqVOkF8+oKtF7 X-Google-Smtp-Source: APXvYqyqylQgiTtk0qUtcRbVmmajaEtH94RAzbb8aZcXGpcpQJVCo6cR71AQg2oifmBFFh58U4Iqzklcu0RGbnD1OhU= X-Received: by 2002:a6b:90d6:: with SMTP id s205mr19847700iod.138.1581531498687; Wed, 12 Feb 2020 10:18:18 -0800 (PST) MIME-Version: 1.0 References: <878sm05s8b.fsf@jcompost-mobl.ch.intel.com> In-Reply-To: <878sm05s8b.fsf@jcompost-mobl.ch.intel.com> From: =?UTF-8?Q?J=C3=A9r=C3=A9my?= Compostella Date: Wed, 12 Feb 2020 11:18:07 -0700 Message-ID: Content-Type: multipart/mixed; boundary="0000000000002e6c78059e64ff58" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::d44 X-Spam-Score: 0.3 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --0000000000002e6c78059e64ff58 Content-Type: multipart/alternative; boundary="0000000000002e6c75059e64ff56" --0000000000002e6c75059e64ff56 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi, I would really appreciate if I could receive a feedback on this patch. I can't send GPG HTML email because of this limitation and this is is also blocking an issue reported of my org-msg module. I have attached the patch here as I have fixed a typo in the commit headline. Let me know if I need to address this patch to another mailing list. Regards, Jeremy . On Tue, Jan 21, 2020 at 4:01 PM Jeremy Compostella < jeremy.compostella@gmail.com> wrote: > If the text/html part is not the unique part of the email, > mml-generate-mime does not expand it to a related multipart. This > break uses cases like PGP signing of an HTML email including images. > > For instance, if you compose an email with the > and a , the second part is > not expanded into a multipart related and the images are not included. > > Signed-off-by: Jeremy Compostella > --- > lisp/gnus/mml.el | 19 ++++++++++++++----- > 1 file changed, 14 insertions(+), 5 deletions(-) > > diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el > index cdd8f3d3a5..3d86c5bc40 100644 > --- a/lisp/gnus/mml.el > +++ b/lisp/gnus/mml.el > @@ -487,11 +487,8 @@ type detected." > (=3D (length cont) 1) > content-type) > (setcdr (assq 'type (cdr (car cont))) content-type)) > - (when (and (consp (car cont)) > - (=3D (length cont) 1) > - (fboundp 'libxml-parse-html-region) > - (equal (cdr (assq 'type (car cont))) "text/html")) > - (setq cont (mml-expand-html-into-multipart-related (car cont)))) > + (when (fboundp 'libxml-parse-html-region) > + (setq cont (mapcar 'mml-expand-all-html-into-multipart-related > cont))) > (prog1 > (with-temp-buffer > (set-buffer-multibyte nil) > @@ -510,6 +507,18 @@ type detected." > (buffer-string)) > (setq message-options options))))) > > +(defun mml-expand-all-html-into-multipart-related (cont) > + (cond ((and (eq (car cont) 'part) > + (equal (cdr (assq 'type cont)) "text/html")) > + (mml-expand-html-into-multipart-related cont)) > + ((eq (car cont) 'multipart) > + (let ((cur (cdr cont))) > + (while (consp cur) > + (setcar cur (mml-expand-all-html-into-multipart-related (car > cur))) > + (setf cur (cdr cur)))) > + cont) > + (t cont))) > + > (defun mml-expand-html-into-multipart-related (cont) > (let ((new-parts nil) > (cid 1)) > -- > 2.24.1 > > --=20 =C2=AB Si debugger, c'est supprimer des bugs, alors programmer ne peut =C3= =AAtre que les ajouter =C2=BB - Edsger Dijkstra --0000000000002e6c75059e64ff56 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi,

I would really appreciate if I coul= d receive a feedback on this patch.=C2=A0 I can't send GPG HTML email b= ecause of this limitation and this is is also blocking an issue reported of= my org-msg module.

I have attached the patch here= as I have fixed a typo in the commit headline.

Le= t me know if I need to address this patch to another mailing list.

Regards,
Jeremy
.

On Tue, Jan 21,= 2020 at 4:01 PM Jeremy Compostella <jeremy.compostella@gmail.com> wrote:
If the text/html part is not the u= nique part of the email,
mml-generate-mime does not expand it to a related multipart. This
break uses cases like PGP signing of an HTML email including images.

For instance, if you compose an email with the <multipart sign=3Dpgpmime= >
and a <part type=3D"text/html" disposition=3Dinline>, the s= econd part is
not expanded into a multipart related and the images are not included.

Signed-off-by: Jeremy Compostella <jeremy.compostella@gmail.com>
---
=C2=A0lisp/gnus/mml.el | 19 ++++++++++++++-----
=C2=A01 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index cdd8f3d3a5..3d86c5bc40 100644
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -487,11 +487,8 @@ type detected."
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(=3D (length = cont) 1)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0content-type)=
=C2=A0 =C2=A0 =C2=A0 =C2=A0 (setcdr (assq 'type (cdr (car cont))) conte= nt-type))
-=C2=A0 =C2=A0 =C2=A0 (when (and (consp (car cont))
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (=3D (length cont)= 1)
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (fboundp 'libx= ml-parse-html-region)
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (equal (cdr (assq = 'type (car cont))) "text/html"))
-=C2=A0 =C2=A0 =C2=A0 =C2=A0(setq cont (mml-expand-html-into-multipart-rela= ted (car cont))))
+=C2=A0 =C2=A0 =C2=A0 (when (fboundp 'libxml-parse-html-region)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0(setq cont (mapcar 'mml-expand-all-html-int= o-multipart-related cont)))
=C2=A0 =C2=A0 =C2=A0 =C2=A0(prog1
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (with-temp-buffer
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (set-buffer-multibyte nil)
@@ -510,6 +507,18 @@ type detected."
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (buffer-string))
=C2=A0 =C2=A0 =C2=A0 =C2=A0 (setq message-options options)))))

+(defun mml-expand-all-html-into-multipart-related (cont)
+=C2=A0 (cond ((and (eq (car cont) 'part)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(equal (cdr (assq 'typ= e cont)) "text/html"))
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 (mml-expand-html-into-multipart-related cont))=
+=C2=A0 =C2=A0 =C2=A0 =C2=A0((eq (car cont) 'multipart)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 (let ((cur (cdr cont)))
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (while (consp cur)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (setcar cur (mml-expand-all-html= -into-multipart-related (car cur)))
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (setf cur (cdr cur))))
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 cont)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0(t cont)))
+
=C2=A0(defun mml-expand-html-into-multipart-related (cont)
=C2=A0 =C2=A0(let ((new-parts nil)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 (cid 1))
--
2.24.1



--
=C2=AB Si debugger, c'est supprimer des bugs= , alors programmer ne peut =C3=AAtre que les ajouter =C2=BB - Edsger Dijkst= ra
--0000000000002e6c75059e64ff56-- --0000000000002e6c78059e64ff58 Content-Type: text/x-patch; charset="US-ASCII"; name="0001-Expand-text-html-regardless-of-its-position-in-the-M.patch" Content-Disposition: attachment; filename="0001-Expand-text-html-regardless-of-its-position-in-the-M.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k6jn08rg0 RnJvbSBhM2IyNGJiYzZhNzM4ZTYwYmM3NGRmM2QxMDgyMjE2MWQ3NDJkNDE3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKZXJlbXkgQ29tcG9zdGVsbGEgPGplcmVteS5jb21wb3N0ZWxs YUBnbWFpbC5jb20+CkRhdGU6IFR1ZSwgMjEgSmFuIDIwMjAgMTU6NDE6MjIgLTA3MDAKU3ViamVj dDogW1BBVENIXSBFeHBhbmQgdGV4dC9odG1sIHJlZ2FyZGxlc3Mgb2YgaXRzIHBvc2l0aW9uIGlu IHRoZSBNSU1FIHRyZWUKCklmIHRoZSB0ZXh0L2h0bWwgcGFydCBpcyBub3QgdGhlIHVuaXF1ZSBw YXJ0IG9mIHRoZSBlbWFpbCwKbW1sLWdlbmVyYXRlLW1pbWUgZG9lcyBub3QgZXhwYW5kIGl0IHRv IGEgcmVsYXRlZCBtdWx0aXBhcnQuIFRoaXMKYnJlYWsgdXNlcyBjYXNlcyBsaWtlIFBHUCBzaWdu aW5nIG9mIGFuIEhUTUwgZW1haWwgaW5jbHVkaW5nIGltYWdlcy4KCkZvciBpbnN0YW5jZSwgaWYg eW91IGNvbXBvc2UgYW4gZW1haWwgd2l0aCB0aGUgPCNtdWx0aXBhcnQgc2lnbj1wZ3BtaW1lPgph bmQgYSA8I3BhcnQgdHlwZT0idGV4dC9odG1sIiBkaXNwb3NpdGlvbj1pbmxpbmU+LCB0aGUgc2Vj b25kIHBhcnQgaXMKbm90IGV4cGFuZGVkIGludG8gYSBtdWx0aXBhcnQgcmVsYXRlZCBhbmQgdGhl IGltYWdlcyBhcmUgbm90IGluY2x1ZGVkLgoKU2lnbmVkLW9mZi1ieTogSmVyZW15IENvbXBvc3Rl bGxhIDxqZXJlbXkuY29tcG9zdGVsbGFAZ21haWwuY29tPgotLS0KIGxpc3AvZ251cy9tbWwuZWwg fCAxOSArKysrKysrKysrKysrKy0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTQgaW5zZXJ0aW9ucygr KSwgNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saXNwL2dudXMvbW1sLmVsIGIvbGlzcC9n bnVzL21tbC5lbAppbmRleCBjZGQ4ZjNkM2E1Li4zZDg2YzViYzQwIDEwMDY0NAotLS0gYS9saXNw L2dudXMvbW1sLmVsCisrKyBiL2xpc3AvZ251cy9tbWwuZWwKQEAgLTQ4NywxMSArNDg3LDggQEAg dHlwZSBkZXRlY3RlZC4iCiAJCSAoPSAobGVuZ3RoIGNvbnQpIDEpCiAJCSBjb250ZW50LXR5cGUp CiAJKHNldGNkciAoYXNzcSAndHlwZSAoY2RyIChjYXIgY29udCkpKSBjb250ZW50LXR5cGUpKQot ICAgICAgKHdoZW4gKGFuZCAoY29uc3AgKGNhciBjb250KSkKLQkJICg9IChsZW5ndGggY29udCkg MSkKLQkJIChmYm91bmRwICdsaWJ4bWwtcGFyc2UtaHRtbC1yZWdpb24pCi0JCSAoZXF1YWwgKGNk ciAoYXNzcSAndHlwZSAoY2FyIGNvbnQpKSkgInRleHQvaHRtbCIpKQotCShzZXRxIGNvbnQgKG1t bC1leHBhbmQtaHRtbC1pbnRvLW11bHRpcGFydC1yZWxhdGVkIChjYXIgY29udCkpKSkKKyAgICAg ICh3aGVuIChmYm91bmRwICdsaWJ4bWwtcGFyc2UtaHRtbC1yZWdpb24pCisJKHNldHEgY29udCAo bWFwY2FyICdtbWwtZXhwYW5kLWFsbC1odG1sLWludG8tbXVsdGlwYXJ0LXJlbGF0ZWQgY29udCkp KQogICAgICAgKHByb2cxCiAJICAod2l0aC10ZW1wLWJ1ZmZlcgogCSAgICAoc2V0LWJ1ZmZlci1t dWx0aWJ5dGUgbmlsKQpAQCAtNTEwLDYgKzUwNywxOCBAQCB0eXBlIGRldGVjdGVkLiIKIAkgICAg KGJ1ZmZlci1zdHJpbmcpKQogCShzZXRxIG1lc3NhZ2Utb3B0aW9ucyBvcHRpb25zKSkpKSkKIAor KGRlZnVuIG1tbC1leHBhbmQtYWxsLWh0bWwtaW50by1tdWx0aXBhcnQtcmVsYXRlZCAoY29udCkK KyAgKGNvbmQgKChhbmQgKGVxIChjYXIgY29udCkgJ3BhcnQpCisJICAgICAgKGVxdWFsIChjZHIg KGFzc3EgJ3R5cGUgY29udCkpICJ0ZXh0L2h0bWwiKSkKKwkgKG1tbC1leHBhbmQtaHRtbC1pbnRv LW11bHRpcGFydC1yZWxhdGVkIGNvbnQpKQorCSgoZXEgKGNhciBjb250KSAnbXVsdGlwYXJ0KQor CSAobGV0ICgoY3VyIChjZHIgY29udCkpKQorCSAgICh3aGlsZSAoY29uc3AgY3VyKQorCSAgICAg KHNldGNhciBjdXIgKG1tbC1leHBhbmQtYWxsLWh0bWwtaW50by1tdWx0aXBhcnQtcmVsYXRlZCAo Y2FyIGN1cikpKQorCSAgICAgKHNldGYgY3VyIChjZHIgY3VyKSkpKQorCSBjb250KQorCSh0IGNv bnQpKSkKKwogKGRlZnVuIG1tbC1leHBhbmQtaHRtbC1pbnRvLW11bHRpcGFydC1yZWxhdGVkIChj b250KQogICAobGV0ICgobmV3LXBhcnRzIG5pbCkKIAkoY2lkIDEpKQotLSAKMi4yNC4xCgo= --0000000000002e6c78059e64ff58-- From unknown Sun Jun 22 07:55:29 2025 X-Loop: help-debbugs@gnu.org Subject: bug#39230: [PATCH] Expand text/html regardless of it position in the MIME tree Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 19 Feb 2020 13:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39230 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Jeremy Compostella Cc: 39230@debbugs.gnu.org Received: via spool by 39230-submit@debbugs.gnu.org id=B39230.158212034030744 (code B ref 39230); Wed, 19 Feb 2020 13:53:02 +0000 Received: (at 39230) by debbugs.gnu.org; 19 Feb 2020 13:52:20 +0000 Received: from localhost ([127.0.0.1]:41808 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j4Pm0-0007zo-0T for submit@debbugs.gnu.org; Wed, 19 Feb 2020 08:52:20 -0500 Received: from quimby.gnus.org ([95.216.78.240]:60500) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j4Plx-0007za-QN for 39230@debbugs.gnu.org; Wed, 19 Feb 2020 08:52:18 -0500 Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=marnie) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1j4Plp-0006gM-3x; Wed, 19 Feb 2020 14:52:11 +0100 From: Lars Ingebrigtsen References: <878sm05s8b.fsf@jcompost-mobl.ch.intel.com> Date: Wed, 19 Feb 2020 14:52:08 +0100 In-Reply-To: <878sm05s8b.fsf@jcompost-mobl.ch.intel.com> (Jeremy Compostella's message of "Tue, 21 Jan 2020 16:01:40 -0700") Message-ID: <87h7zm8z1z.fsf@gnus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Jeremy Compostella writes: > If the text/html part is not the unique part of the email, > mml-generate-mime does not expand it to a related multipart. This > break uses cases like PGP signing of an HTML email including images. [...] Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: ingebrigtsen.no] -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Jeremy Compostella writes: > If the text/html part is not the unique part of the email, > mml-generate-mime does not expand it to a related multipart. This > break uses cases like PGP signing of an HTML email including images. > > For instance, if you compose an email with the > and a , the second part is > not expanded into a multipart related and the images are not included. Makes sense. I've now applied the patch to Emacs 28. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 19 08:52:24 2020 Received: (at control) by debbugs.gnu.org; 19 Feb 2020 13:52:24 +0000 Received: from localhost ([127.0.0.1]:41811 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j4Pm4-000804-A7 for submit@debbugs.gnu.org; Wed, 19 Feb 2020 08:52:24 -0500 Received: from quimby.gnus.org ([95.216.78.240]:60514) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j4Pm2-0007zg-Ls for control@debbugs.gnu.org; Wed, 19 Feb 2020 08:52:22 -0500 Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=marnie) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1j4Plv-0006gS-1I for control@debbugs.gnu.org; Wed, 19 Feb 2020 14:52:17 +0100 Date: Wed, 19 Feb 2020 14:52:14 +0100 Message-Id: <87ftf68z1t.fsf@gnus.org> To: control@debbugs.gnu.org From: Lars Ingebrigtsen Subject: control message for bug #39230 X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: tags 39230 fixed close 39230 28.1 quit Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) tags 39230 fixed close 39230 28.1 quit From unknown Sun Jun 22 07:55:29 2025 X-Loop: help-debbugs@gnu.org Subject: bug#39230: [PATCH] Expand text/html regardless of it position in the MIME tree Resent-From: =?UTF-8?Q?J=C3=A9r=C3=A9my?= Compostella Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 28 Feb 2020 17:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39230 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: fixed patch To: 39230@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158291003911666 (code B ref -1); Fri, 28 Feb 2020 17:14:01 +0000 Received: (at submit) by debbugs.gnu.org; 28 Feb 2020 17:13:59 +0000 Received: from localhost ([127.0.0.1]:33740 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j7jD5-000325-GJ for submit@debbugs.gnu.org; Fri, 28 Feb 2020 12:13:59 -0500 Received: from lists.gnu.org ([209.51.188.17]:50096) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j7jD3-00031w-NX for submit@debbugs.gnu.org; Fri, 28 Feb 2020 12:13:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34531) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j7jD1-00089o-Us for bug-gnu-emacs@gnu.org; Fri, 28 Feb 2020 12:13:57 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j7jD0-0004pz-HD for bug-gnu-emacs@gnu.org; Fri, 28 Feb 2020 12:13:55 -0500 Received: from mail-io1-xd43.google.com ([2607:f8b0:4864:20::d43]:40170) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j7jD0-0004oc-8G for bug-gnu-emacs@gnu.org; Fri, 28 Feb 2020 12:13:54 -0500 Received: by mail-io1-xd43.google.com with SMTP id x1so4183960iop.7 for ; Fri, 28 Feb 2020 09:13:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=FrXbDzggDzRS7R0YOePzxavPAtXUJ9xtn5TqNdwCMw8=; b=GypmMA0h0syC0RB37LgWVLaX5S0aUpk6k568G8+z+tSX6NPJsPMEUoMQ6ymXlKZ61i 1mHJB4aX3olMnH4PTgHoex+jxjrh8LT813Rm08RxoWzE/bzCzhsB+K1BoBtVH5zlUerB mc8f/qLqPqlHtY8s0aMcXevgj+rJ6RRLFkFjylOon1pTF6qDEJNeXpgI2LdJTjohdh5G bMNPsIs4WXHN5wM+v0eGoaDesBi88Xcwc+ob1mvj+yFp3lggi8dtCqFIHiggc3GJf9YL vsFv2m1DPsp16zlzv+yncq/C9tM+vRhv0/hCXTq9P09gs7xCc4O7A/uMZTx2PBBjib2C Antg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=FrXbDzggDzRS7R0YOePzxavPAtXUJ9xtn5TqNdwCMw8=; b=q9S4pnElccMJPd95rS3f3zJsbKEb3ZFCAmZm8dNmjdr7f5WrPH5DDUHzTevjIRyhvE dE842hmn9dKDCk87xBZdAJuKZD3XyVFgyL8q70/fqiHPqXGRMvuukJtac5kZr1RzHQrq AUINFIqzaQZK/LYB/IYF39QsA1nTIcdT2bN+XNQUrdChk/GBYmxBUuSFg9Z+QasvGTxD fM124Ql2OWR6oIJE4fg5Nt0G9nqyPjx/n590A+RUs48B2x6weYG8h8Ya0r2Bak9fgJxy FoBvR3Ms7v7TBi2DOMWJT4SMFOzuNvAcci3qqHGQ9LIesRgnAGU7+ArQTuzlL3DAPzgz 1LwQ== X-Gm-Message-State: APjAAAUfWsoevtFHdXEhj+Djunr1yiEeHF69XOaRIWausTDskFo2NflK Xx5G3DlL8F4OUfGRQyiqdpVhWNAusCv0GyEOUyziCuFAQ1o= X-Google-Smtp-Source: APXvYqzhB7JSmjnxCEow4UIL3Il/durTbwRonXBaHcNP8r4kiGcN0KdPj55qgQdMdWkBm1U586ohB3UE65i/4+VGs5s= X-Received: by 2002:a05:6638:501:: with SMTP id i1mr4117432jar.25.1582910032818; Fri, 28 Feb 2020 09:13:52 -0800 (PST) MIME-Version: 1.0 References: <878sm05s8b.fsf@jcompost-mobl.ch.intel.com> In-Reply-To: From: =?UTF-8?Q?J=C3=A9r=C3=A9my?= Compostella Date: Fri, 28 Feb 2020 10:13:41 -0700 Message-ID: Content-Type: multipart/mixed; boundary="00000000000037f78a059fa5f692" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::d43 X-Spam-Score: 0.3 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --00000000000037f78a059fa5f692 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable An issue has been identified with this patch for which I wrote a fix. I ran many tests and combination with this additional patch (see attachement) and I could not find any issue left. The reason I missed this obvious bug was my configuration using my `org-msg' module which has an advice on `mml-expand-html-into-multipart-related' to workaround the limitation that my previous patch addresses. The issue originates from the fact that the `mml-expand-html-into-multipart-related' function returns a list of list for an untouched part while it returns a simple list for expanded multipart. The recursive engine of `mml-expand-all-html-into-multipart-related' is not handling this. Considering that the `mml-expand-html-into-multipart-related' function is only used by mml as an internal function, IMO the best approach is to make it consistent on its potential return values structure. The patch I am submitting here makes `mml-expand-html-into-multipart-related' returns a simple list regardless of if it is a part or a multipart. On Wed, Feb 12, 2020 at 11:18 AM J=C3=A9r=C3=A9my Compostella wrote: > > Hi, > > I would really appreciate if I could receive a feedback on this patch. I= can't send GPG HTML email because of this limitation and this is is also b= locking an issue reported of my org-msg module. > > I have attached the patch here as I have fixed a typo in the commit headl= ine. > > Let me know if I need to address this patch to another mailing list. > > Regards, > Jeremy > . > > On Tue, Jan 21, 2020 at 4:01 PM Jeremy Compostella wrote: >> >> If the text/html part is not the unique part of the email, >> mml-generate-mime does not expand it to a related multipart. This >> break uses cases like PGP signing of an HTML email including images. >> >> For instance, if you compose an email with the >> and a , the second part is >> not expanded into a multipart related and the images are not included. >> >> Signed-off-by: Jeremy Compostella >> --- >> lisp/gnus/mml.el | 19 ++++++++++++++----- >> 1 file changed, 14 insertions(+), 5 deletions(-) >> >> diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el >> index cdd8f3d3a5..3d86c5bc40 100644 >> --- a/lisp/gnus/mml.el >> +++ b/lisp/gnus/mml.el >> @@ -487,11 +487,8 @@ type detected." >> (=3D (length cont) 1) >> content-type) >> (setcdr (assq 'type (cdr (car cont))) content-type)) >> - (when (and (consp (car cont)) >> - (=3D (length cont) 1) >> - (fboundp 'libxml-parse-html-region) >> - (equal (cdr (assq 'type (car cont))) "text/html")) >> - (setq cont (mml-expand-html-into-multipart-related (car cont)))) >> + (when (fboundp 'libxml-parse-html-region) >> + (setq cont (mapcar 'mml-expand-all-html-into-multipart-related c= ont))) >> (prog1 >> (with-temp-buffer >> (set-buffer-multibyte nil) >> @@ -510,6 +507,18 @@ type detected." >> (buffer-string)) >> (setq message-options options))))) >> >> +(defun mml-expand-all-html-into-multipart-related (cont) >> + (cond ((and (eq (car cont) 'part) >> + (equal (cdr (assq 'type cont)) "text/html")) >> + (mml-expand-html-into-multipart-related cont)) >> + ((eq (car cont) 'multipart) >> + (let ((cur (cdr cont))) >> + (while (consp cur) >> + (setcar cur (mml-expand-all-html-into-multipart-related (ca= r cur))) >> + (setf cur (cdr cur)))) >> + cont) >> + (t cont))) >> + >> (defun mml-expand-html-into-multipart-related (cont) >> (let ((new-parts nil) >> (cid 1)) >> -- >> 2.24.1 >> > > > -- > =C2=AB Si debugger, c'est supprimer des bugs, alors programmer ne peut = =C3=AAtre que les ajouter =C2=BB - Edsger Dijkstra --=20 =C2=AB Si debugger, c'est supprimer des bugs, alors programmer ne peut =C3= =AAtre que les ajouter =C2=BB - Edsger Dijkstra --00000000000037f78a059fa5f692 Content-Type: text/x-patch; charset="US-ASCII"; name="0001-Fix-nesting-list.patch" Content-Disposition: attachment; filename="0001-Fix-nesting-list.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k76fr7i60 RnJvbSAwYmNkZDI3MDcxNTk3NmUxZGJlM2IwOTZmMzg4ZjdmM2Q2Njg5ODMxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKZXJlbXkgQ29tcG9zdGVsbGEgPGplcmVteS5jb21wb3N0ZWxs YUBnbWFpbC5jb20+CkRhdGU6IFNhdCwgMjIgRmViIDIwMjAgMTA6NTg6MjUgLTA3MDAKU3ViamVj dDogW1BBVENIXSBGaXggbmVzdGluZyBsaXN0CgoqIGxpc3AvZ251cy9tbWwuZWwgKG1tbC1leHBh bmQtaHRtbC1pbnRvLW11bHRpcGFydC1yZWxhdGVkKTogVGhpcyBpcwpmdW5jdGlvbiBpcyBub3cg Y2FsbGVkIGJ5IGEgcmVjdXJzaXZlCmVuZ2luZSAobW1sLWV4cGFuZC1hbGwtaHRtbC1pbnRvLW11 bHRpcGFydC1yZWxhdGVkKS4gIFRoZSBzdHJ1Y3R1cmUgb2YKdGhlIHJldHVybmVkIHZhbHVlIHNo b3VsZCBiZSBpZGVudGljYWwgYmV0d2VlbiBhbiB1bnRvdWNoZWQgcGFydCBhbmQgYQpleHBhbmRl ZCBtdWx0aXBhcnQuCi0tLQogbGlzcC9nbnVzL21tbC5lbCB8IDcgKysrLS0tLQogMSBmaWxlIGNo YW5nZWQsIDMgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saXNw L2dudXMvbW1sLmVsIGIvbGlzcC9nbnVzL21tbC5lbAppbmRleCAzZDg2YzViYzQwLi4yMDA2ODM3 ZDZhIDEwMDY0NAotLS0gYS9saXNwL2dudXMvbW1sLmVsCisrKyBiL2xpc3AvZ251cy9tbWwuZWwK QEAgLTU0Nyw4ICs1NDcsNyBAQCB0eXBlIGRldGVjdGVkLiIKIAkJCW5ldy1wYXJ0cykpCiAJCShz ZXRxIGNpZCAoMSsgY2lkKSkpKSkpKQogICAgICAgOzsgV2UgaGF2ZSBsb2NhbCBpbWFnZXMgdGhh dCB3ZSB3YW50IHRvIGluY2x1ZGUuCi0gICAgICAoaWYgKG5vdCBuZXctcGFydHMpCi0JICAobGlz dCBjb250KQorICAgICAgKHdoZW4gbmV3LXBhcnRzCiAJKHNldGNkciAoYXNzcSAnY29udGVudHMg Y29udCkgKGJ1ZmZlci1zdHJpbmcpKQogCShzZXRxIGNvbnQKIAkgICAgICAobmNvbmMgKGxpc3Qg J211bHRpcGFydCAoY29ucyAndHlwZSAicmVsYXRlZCIpKQpAQCAtNTYxLDggKzU2MCw4IEBAIHR5 cGUgZGV0ZWN0ZWQuIgogCQkJCSAgICAgICAobnRoIDEgbmV3LXBhcnQpCiAJCQkJICAgICAgIChu dGggMiBuZXctcGFydCkpCiAJCQkJICAgIChpZCAuICwoY29uY2F0ICI8IiAobnRoIDAgbmV3LXBh cnQpCi0JCQkJCQkgICAiPiIpKSkpKSkpCi0JY29udCkpKSkKKwkJCQkJCSAgICI+IikpKSkpKSkp CisgICAgICBjb250KSkpCiAKIChhdXRvbG9hZCAnaW1hZ2UtcHJvcGVydHkgImltYWdlIikKIAot LSAKMi4yNC4xCgo= --00000000000037f78a059fa5f692-- From unknown Sun Jun 22 07:55:29 2025 X-Loop: help-debbugs@gnu.org Subject: bug#39230: [PATCH] Expand text/html regardless of it position in the MIME tree Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 14 Mar 2020 11:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39230 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: fixed patch To: =?UTF-8?Q?J=C3=A9r=C3=A9my?= Compostella Cc: 39230@debbugs.gnu.org Received: via spool by 39230-submit@debbugs.gnu.org id=B39230.15841863401847 (code B ref 39230); Sat, 14 Mar 2020 11:46:02 +0000 Received: (at 39230) by debbugs.gnu.org; 14 Mar 2020 11:45:40 +0000 Received: from localhost ([127.0.0.1]:60670 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jD5EZ-0000TV-PU for submit@debbugs.gnu.org; Sat, 14 Mar 2020 07:45:39 -0400 Received: from quimby.gnus.org ([95.216.78.240]:56258) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jD5EX-0000Mm-Vf for 39230@debbugs.gnu.org; Sat, 14 Mar 2020 07:45:38 -0400 Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=marnie) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jD5EP-0001NA-OF; Sat, 14 Mar 2020 12:45:32 +0100 From: Lars Ingebrigtsen References: <878sm05s8b.fsf@jcompost-mobl.ch.intel.com> Date: Sat, 14 Mar 2020 12:45:28 +0100 In-Reply-To: ("=?UTF-8?Q?J=C3=A9r=C3=A9my?= Compostella"'s message of "Fri, 28 Feb 2020 10:13:41 -0700") Message-ID: <87lfo317on.fsf@gnus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: =?UTF-8?Q?J=C3=A9r=C3=A9my?= Compostella writes: > The reason I missed this obvious bug was my configuration using my > `org-msg' module which has an advice on > `mml-expand-html-into-multipart-related' to workaround the limitation > that my previou [...] Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: ingebrigtsen.no] -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) J=C3=A9r=C3=A9my Compostella writes: > The reason I missed this obvious bug was my configuration using my > `org-msg' module which has an advice on > `mml-expand-html-into-multipart-related' to workaround the limitation > that my previous patch addresses. Thanks; applied to Emacs 28. --=20 (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 14 07:45:47 2020 Received: (at control) by debbugs.gnu.org; 14 Mar 2020 11:45:47 +0000 Received: from localhost ([127.0.0.1]:60673 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jD5Eh-0000Zn-17 for submit@debbugs.gnu.org; Sat, 14 Mar 2020 07:45:47 -0400 Received: from quimby.gnus.org ([95.216.78.240]:56272) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jD5Ef-0000T2-FK for control@debbugs.gnu.org; Sat, 14 Mar 2020 07:45:45 -0400 Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=marnie) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jD5EW-0001NI-UR for control@debbugs.gnu.org; Sat, 14 Mar 2020 12:45:38 +0100 Date: Sat, 14 Mar 2020 12:45:36 +0100 Message-Id: <87k13n17of.fsf@gnus.org> To: control@debbugs.gnu.org From: Lars Ingebrigtsen Subject: control message for bug #39230 X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: tags 39230 fixed close 39230 28.1 quit Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) tags 39230 fixed close 39230 28.1 quit