Re: [PATCH 1/2] emacs/cli: remove entire-thread default from show: JSON

diff --git a/69/57ee3862c66914996da5ebe7e524ce90dd72c5 b/69/57ee3862c66914996da5ebe7e524ce90dd72c5
new file mode 100644 (file)
index 0000000..e82f5a9
--- /dev/null
+++ b/69/57ee3862c66914996da5ebe7e524ce90dd72c5
@@ -0,0 +1,103 @@
+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 884CA431FBC\r
+       for <notmuch@notmuchmail.org>; Thu, 23 Feb 2012 14:02:26 -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 RssgzJxGVHmP for <notmuch@notmuchmail.org>;\r
+       Thu, 23 Feb 2012 14:02:26 -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 020A9431FAE\r
+       for <notmuch@notmuchmail.org>; Thu, 23 Feb 2012 14:02:25 -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 1S0gk1-0007S2-Q3; Thu, 23 Feb 2012 22:02:22 +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 1S0gk1-00058w-J0; Thu, 23 Feb 2012 22:02:21 +0000\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Adam Wolfe Gordon <awg+notmuch@xvx.ca>\r
+Subject: Re: [PATCH 1/2] emacs/cli: remove entire-thread default from show:\r
+       JSON\r
+In-Reply-To:\r
+ <CAMoJFUtX4c1yvu4=CU9HQHG2eK4=_Tf4Gf40UgJeWuZe7aF-Zg@mail.gmail.com>\r
+References: <1330033294-21980-1-git-send-email-markwalters1009@gmail.com>\r
+       <1330033294-21980-2-git-send-email-markwalters1009@gmail.com>\r
+       <CAMoJFUtX4c1yvu4=CU9HQHG2eK4=_Tf4Gf40UgJeWuZe7aF-Zg@mail.gmail.com>\r
+User-Agent: Notmuch/0.11.1+216~gc56f296 (http://notmuchmail.org) Emacs/23.2.1\r
+       (i486-pc-linux-gnu)\r
+Date: Thu, 23 Feb 2012 22:04:00 +0000\r
+Message-ID: <877gzdxl4f.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=utf-8\r
+Content-Transfer-Encoding: quoted-printable\r
+X-Sender-Host-Address: 94.192.233.223\r
+X-QM-SPAM-Info: Sender has good ham record.  :)\r
+X-QM-Body-MD5: 30c009ec24049c1252d252df5d04fb20 (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
+Cc: notmuch@notmuchmail.org\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, 23 Feb 2012 22:02:26 -0000\r
+\r
+On Thu, 23 Feb 2012 14:45:57 -0700, Adam Wolfe Gordon <awg+notmuch@xvx.ca> =\r
+wrote:\r
+> Hi Mark,\r
+>=20\r
+> On Thu, Feb 23, 2012 at 14:41, Mark Walters <markwalters1009@gmail.com> w=\r
+rote:\r
+> > Previously notmuch-show.c defaulted to --entire-thread when\r
+> > format=3Djson. =C2=A0Make the default just the matching messages, but m=\r
+ake\r
+> > the single emacs caller add --entire-thread to the arguments supplied\r
+> > so the end result should be unchanged.\r
+>=20\r
+> The patch looks good to me. You should probably update the man page as\r
+> well, to reflect the change in defauls.\r
+\r
+Thanks for the review. I will include an updated man page in the next\r
+version.\r
+\r
+Many thanks\r
+\r
+Mark\r
+\r