Re: [PATCH v3 2/5] reply: Add a JSON reply format.

diff --git a/b9/476cb740a8095384ac6f5876549ef7ee94b68d b/b9/476cb740a8095384ac6f5876549ef7ee94b68d
new file mode 100644 (file)
index 0000000..87f054f
--- /dev/null
+++ b/b9/476cb740a8095384ac6f5876549ef7ee94b68d
@@ -0,0 +1,113 @@
+Return-Path: <m.walters@qmul.ac.uk>\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 C93C8431FAF\r
+       for <notmuch@notmuchmail.org>; Sun,  5 Feb 2012 04:43:58 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+       tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+       NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 2XlPp0BNrU7o for <notmuch@notmuchmail.org>;\r
+       Sun,  5 Feb 2012 04:43:58 -0800 (PST)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 16CAC431FAE\r
+       for <notmuch@notmuchmail.org>; Sun,  5 Feb 2012 04:43:58 -0800 (PST)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+       by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1Ru1Rj-0001b6-Mc; Sun, 05 Feb 2012 12:43:56 +0000\r
+Received: from 94-192-233-223.zone6.bethere.co.uk ([94.192.233.223]\r
+       helo=localhost)\r
+       by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1Ru1Rj-00024Z-Ea; Sun, 05 Feb 2012 12:43:55 +0000\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Adam Wolfe Gordon <awg+notmuch@xvx.ca>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v3 2/5] reply: Add a JSON reply format.\r
+In-Reply-To: <87mx8xpki3.fsf@qmul.ac.uk>\r
+References: <1326995217-27423-1-git-send-email-awg+notmuch@xvx.ca>\r
+       <1326995217-27423-3-git-send-email-awg+notmuch@xvx.ca>\r
+       <87mx8xpki3.fsf@qmul.ac.uk>\r
+User-Agent: Notmuch/0.11+154~ged6d37e (http://notmuchmail.org) Emacs/23.2.1\r
+       (i486-pc-linux-gnu)\r
+Date: Sun, 05 Feb 2012 12:45:05 +0000\r
+Message-ID: <871uq9wisu.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 94.192.233.223\r
+X-QM-SPAM-Info: Sender has good ham record.  :)\r
+X-QM-Body-MD5: 57223c4c5fb3b518acb2be89ed8d0267 (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+       determine if it is\r
+       spam. We require at least 5.0 points to mark a message as spam.\r
+       This message scored -1.8 points.\r
+       Summary of the scoring: \r
+       * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+       *      medium trust\r
+       *      [138.37.6.40 listed in list.dnswl.org]\r
+       * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+       provider *      (markwalters1009[at]gmail.com)\r
+       * -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay\r
+       *      domain\r
+       *  0.5 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\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: Sun, 05 Feb 2012 12:43:58 -0000\r
+\r
+\r
+On Sun, 05 Feb 2012 11:50:12 +0000, Mark Walters <markwalters1009@gmail.com> wrote:\r
+> On Thu, 19 Jan 2012 10:46:54 -0700, Adam Wolfe Gordon <awg+notmuch@xvx.ca> wrote:\r
+> > This new JSON format for replies includes headers generated for a reply\r
+> > message as well as the headers and all text parts of the original message.\r
+> > Using this data, a client can intelligently create a reply. For example,\r
+> > the emacs client will be able to create replies with quoted HTML parts by\r
+> > parsing the HTML parts using w3m.\r
+> \r
+> Hi this is only a preliminary look so far as I read the code. Note this\r
+> is the first time I have tried reviewing a substantial chunk of code so\r
+> sorry for any stupidities on my part!\r
+\r
+After Austin's show modifications (commit 7430a42) I needed the\r
+following patch which is probably trivial but I was only guessing based\r
+on the other change to notmuch-reply Austin made at the time.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+diff --git a/notmuch-reply.c b/notmuch-reply.c\r
+index 9aefce8..1c62b54 100644\r
+--- a/notmuch-reply.c\r
++++ b/notmuch-reply.c\r
+@@ -56,7 +56,7 @@ static const notmuch_show_format_t format_reply = {\r
+ };\r
+ \r
+ static const notmuch_show_format_t format_json = {\r
+-    "",\r
++    "", NULL,\r
+       "", NULL,\r
+           "", NULL, NULL, "",\r
+           "",\r
+\r
+\r