notmuch-emacs replying produces excessive indenting on multipart/signed or multipart...

diff --git a/7a/337ae930b60eb3c36743efe474d766b04a4d39 b/7a/337ae930b60eb3c36743efe474d766b04a4d39
new file mode 100644 (file)
index 0000000..7be3c64
--- /dev/null
+++ b/7a/337ae930b60eb3c36743efe474d766b04a4d39
@@ -0,0 +1,114 @@
+Return-Path: <dkg@fifthhorseman.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 9CD886DE02C2\r
+ for <notmuch@notmuchmail.org>; Sat,  9 Apr 2016 11:32:51 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.076\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.076 tagged_above=-999 required=5\r
+ tests=[AWL=-0.076] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id H8GYMMIMbqil for <notmuch@notmuchmail.org>;\r
+ Sat,  9 Apr 2016 11:32:43 -0700 (PDT)\r
+Received: from che.mayfirst.org (che.mayfirst.org [209.234.253.108])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 4C1436DE00BD\r
+ for <notmuch@notmuchmail.org>; Sat,  9 Apr 2016 11:32:43 -0700 (PDT)\r
+Received: from fifthhorseman.net (ool-6c3a0662.static.optonline.net\r
+ [108.58.6.98])\r
+ by che.mayfirst.org (Postfix) with ESMTPSA id E9969FF73\r
+ for <notmuch@notmuchmail.org>; Sat,  9 Apr 2016 14:32:40 -0400 (EDT)\r
+Received: by fifthhorseman.net (Postfix, from userid 1000)\r
+ id 26045206E1; Sat,  9 Apr 2016 07:26:13 -0300 (BRT)\r
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: notmuch-emacs replying produces excessive indenting on\r
+ multipart/signed or multipart/mixed amil?\r
+User-Agent: Notmuch/0.21+124~gbf604e9 (http://notmuchmail.org) Emacs/24.5.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Sat, 09 Apr 2016 07:26:09 -0300\r
+Message-ID: <87lh4nm62m.fsf@alice.fifthhorseman.net>\r
+MIME-Version: 1.0\r
+Content-Type: multipart/signed; boundary="=-=-=";\r
+ micalg=pgp-sha512; protocol="application/pgp-signature"\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 09 Apr 2016 18:32:51 -0000\r
+\r
+--=-=-=\r
+Content-Type: text/plain\r
+\r
+Hey all--\r
+\r
+I'm running from the head of notmuch development right now, and when i\r
+reply to multipart/signed or multipart/mixed mail in notmuch-emacs, i'm\r
+noticing that the attributed text now has excessive indentation (it did\r
+not when running from the latest release).\r
+\r
+to be clear, i'm talking about replies that now look like:\r
+\r
+-------------\r
+On Sat, 09 Apr 2016 01:02:29 +0200, Test User <test@exmaple.org> wrote:\r
+\r
+>   This is some example text.  in the original message, it is\r
+>   flush-aligned on the left-hand side.\r
+-------------\r
+\r
+instead of what i want, which is:\r
+\r
+-------------\r
+On Sat, 09 Apr 2016 01:02:29 +0200, Test User <test@exmaple.org> wrote:\r
+\r
+> This is some example text.  in the original message, it is\r
+> flush-aligned on the left-hand side.\r
+-------------\r
+\r
+interestingly, the command line still shows the right thing:\r
+\r
+  notmuch reply id:$MSGID\r
+\r
+has the correct layer of indentation, as does:\r
+\r
+  notmuch reply --decrypt id:$MSGID\r
+\r
+Does anyone else see this behavior?  If you're using notmuch-emacs, try\r
+replying to this message and looking at the attributed text.\r
+\r
+         --dkg\r
+\r
+--=-=-=\r
+Content-Type: application/pgp-signature; name="signature.asc"\r
+\r
+-----BEGIN PGP SIGNATURE-----\r
+Version: GnuPG v2\r
+\r
+iQJ8BAEBCgBmBQJXCNjBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w\r
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFREIyRTc0RjU2RkNGMkI2NzI5N0I3MzUy\r
+NEVDRkY1QUZGNjgzNzBBAAoJECTs/1r/aDcKUMsQALL9At76kXY2Unk2/GF5EKDG\r
+7n7mpxh6qXUAL4XRboIKXcEf4dnU5q5TTv35bXPwI4obMOKR+naMxFsJ0qJrEWAp\r
+BXj0UOWO4+yZHBkoOcE79h9vGN5qVXD9ZA+5ubxQ7QzkBcQWcmckL/iaMUS7kH5V\r
+xozuim4alo7DYmXI8Od7NgrHTrES5rHoAZjcWq2AhfHX6x0FNAKRgOlol0ln333r\r
+iBUoreT9LoP8eRkgB0M9oQpQak0DJNrDYI5g80ey7XXtajcFOnkk3IWCPGo5jZD9\r
+Xjyei/x90TLMAeHc1vQAMJ9LWHIZoYQzzJ6EpOkA7TcoCqTzj0BrMXQyi7aNWFyz\r
+QkjseIb1qKTQ7Erp3aunJyg2ZWm7/KhuUPwwV+3XGxo0PsWWcl2XTWYZzD8T0JQQ\r
+apwUvl+5NCnCW7UWSeT2+BywvtCZu0YWd5sPIYJIVXOpn6vojk3rbRJK1Xl78Rua\r
+4RP8hEJkZsQDvE/KMgHLHTmbu0WVe3V/FpFZaC09FFfmackeJv4kXz6vZv710nc9\r
+Cp2X6oGWOjgEAwq0M0xjkERcQ61ptG3dD0pUB8jjlkB7VlK77atQBV8ZZ78TE61u\r
+dywj+OubcXXuhwK9Tu29SLhcwWK4oDS089Dzuw0Y07BayGYNv1di3IYC1YcDFuF7\r
+xV9RElnDjkY2RsRVzvuD\r
+=wenJ\r
+-----END PGP SIGNATURE-----\r
+--=-=-=--\r