Re: [BUG/PATCH v2] emacs: Fix the References header in reply

diff --git a/31/a87319d5c45280ad3a3a96be699a2d51c0a6d7 b/31/a87319d5c45280ad3a3a96be699a2d51c0a6d7
new file mode 100644 (file)
index 0000000..669f235
--- /dev/null
+++ b/31/a87319d5c45280ad3a3a96be699a2d51c0a6d7
@@ -0,0 +1,108 @@
+Return-Path: <jrollins@finestructure.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 olra.theworths.org (Postfix) with ESMTP id E06D6431FAF\r
+       for <notmuch@notmuchmail.org>; Thu, 29 Mar 2012 10:14:56 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.29\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.29 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3, T_MIME_NO_TEXT=0.01] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id 3Ok5VKYvDJ6J for <notmuch@notmuchmail.org>;\r
+       Thu, 29 Mar 2012 10:14:56 -0700 (PDT)\r
+Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu\r
+       [131.215.239.19])\r
+       by olra.theworths.org (Postfix) with ESMTP id 4B1BC431FAE\r
+       for <notmuch@notmuchmail.org>; Thu, 29 Mar 2012 10:14:56 -0700 (PDT)\r
+Received: from fire-doxen.imss.caltech.edu (localhost [127.0.0.1])\r
+       by fire-doxen-postvirus (Postfix) with ESMTP id BF3DC328070;\r
+       Thu, 29 Mar 2012 10:14:53 -0700 (PDT)\r
+X-Spam-Scanned: at Caltech-IMSS on fire-doxen by amavisd-new\r
+Received: from finestructure.net (DHCP-123-229.caltech.edu [131.215.123.229])\r
+       (Authenticated sender: jrollins)\r
+       by fire-doxen-submit (Postfix) with ESMTP id 0A353328064;\r
+       Thu, 29 Mar 2012 10:14:51 -0700 (PDT)\r
+Received: by finestructure.net (Postfix, from userid 1000)\r
+       id D9955E0; Thu, 29 Mar 2012 10:14:49 -0700 (PDT)\r
+From: Jameson Graef Rollins <jrollins@finestructure.net>\r
+To: Adam Wolfe Gordon <awg+notmuch@xvx.ca>, notmuch@notmuchmail.org\r
+Subject: Re: [BUG/PATCH v2] emacs: Fix the References header in reply\r
+In-Reply-To: <1332996818-15700-1-git-send-email-awg+notmuch@xvx.ca>\r
+References: <1332991226-510-1-git-send-email-awg+notmuch@xvx.ca>\r
+       <1332996818-15700-1-git-send-email-awg+notmuch@xvx.ca>\r
+User-Agent: Notmuch/0.12+78~g127fa56 (http://notmuchmail.org) Emacs/23.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Thu, 29 Mar 2012 10:14:47 -0700\r
+Message-ID: <87aa2zjpmg.fsf@servo.finestructure.net>\r
+MIME-Version: 1.0\r
+Content-Type: multipart/signed; boundary="=-=-=";\r
+       micalg=pgp-sha256; protocol="application/pgp-signature"\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://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: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Thu, 29 Mar 2012 17:14:57 -0000\r
+\r
+--=-=-=\r
+\r
+On Wed, Mar 28 2012, Adam Wolfe Gordon <awg+notmuch@xvx.ca> wrote:\r
+> In the new reply code, the References header gets inserted by\r
+> message.el using a function called message-shorten-references. Unlike\r
+> all the other header-inserting functions, it doesn't put a newline\r
+> after the header, causing the next header to end up on the same\r
+> line. In our case, this header happened to be User-Agent, so it's hard\r
+> to notice. This is probably a bug in message.el, but we need to work\r
+> around it.\r
+>\r
+> This fixes the problem by wrapping message-shorten-references in a\r
+> function that inserts a newline after if necessary. This should\r
+> protect against the message.el bug being fixed in the future.\r
+\r
+Hey, Adam.  Thanks so much for working on this.\r
+\r
+I just tested this patch and it does seem to fix the issue.  However, a\r
+side effect seems to be that the References header is now appearing as\r
+the first header in the reply buffer, rather than the last, as it used\r
+to.  I suppose this is merely aesthetic, but I did prefer the ordering\r
+as it was before.  Is there a way to tweak the\r
+message-header-format-alist so that the References header appears last\r
+again?\r
+\r
+Given the various things that are being affected by this, it would\r
+probably be good to add a test for this as well.\r
+\r
+jamie.\r
+\r
+--=-=-=\r
+Content-Type: application/pgp-signature\r
+\r
+-----BEGIN PGP SIGNATURE-----\r
+Version: GnuPG v1.4.12 (GNU/Linux)\r
+\r
+iQIcBAEBCAAGBQJPdJiHAAoJEO00zqvie6q8kOMQAIUbXIrJtMolxvwdA9gw5mBk\r
+KFtYfuCg236TXMu0hqHw68HDPNYRjhEc/8laHgbblq6Mq9WfrDJYfSqQKSiNc1wC\r
+75Lj24t1eobRXNNqlFl4Y2BJC3q8DPolCif/+soeAM/D9yVq864g1q5hHOFBDWcp\r
+7Zvf72DW6S11TZn/QH+oJxsDkLmFRGikDMEBIR0BHIZba5a8varGe+Qem496of7S\r
+FYfwGXXGQnXigGKELjkxcQbtx3MLyolsZDj61hMsaC1Q6GeBaZShF3TAugBzcw/o\r
+tQ2df4bMLt0IqWGUgMgHFFuenu/fYVSn0QU2nblrulDBqJiMQhmSYHLAORvel3in\r
+QYzcTpn5d17vhlwIswudVTdci9sLmF+qfz92OGLYZKbx2c2V7rN6pG1KowvU7VMK\r
+92S34pzgOj3YNwyhXWC1SKJbltaT/ov0pUpElmmNC8jy0d8GW39RGrWY9gmhEj3D\r
+Z6a9T58Lzd4biBhkWBMzv7jgcwxY6aujUH91cI0dEgASP8fb+pOELSKOS4bzUXf7\r
+pXk7tT48Mlh0ZIuKzHzJzrKr471F3xqPZUb1IwsoyDCjCP1wchPA6kRw/qZQU8tr\r
+nP6/Jk415WsSfEQ1uhZV4QsIFkYMOSIOnDh90VQEjsNMIhRrB/FEWOoJI/X3/Ds3\r
+j4o/36X+pQgzdfh91E4u\r
+=J6sU\r
+-----END PGP SIGNATURE-----\r
+--=-=-=--\r