Return-Path: <markwalters1009@gmail.com>
X-Original-To: notmuch@notmuchmail.org
Delivered-To: notmuch@notmuchmail.org
Received: from localhost (localhost [127.0.0.1])
	by olra.theworths.org (Postfix) with ESMTP id 01E55431FB6
	for <notmuch@notmuchmail.org>; Sun,  3 Jun 2012 04:46:20 -0700 (PDT)
X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
X-Spam-Flag: NO
X-Spam-Score: 2.7
X-Spam-Level: **
X-Spam-Status: No, score=2.7 tagged_above=-999 required=5
	tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
	FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,
	FREEMAIL_REPLY=2.499, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
Received: from olra.theworths.org ([127.0.0.1])
	by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id aWrYAW0r8tYO for <notmuch@notmuchmail.org>;
	Sun,  3 Jun 2012 04:46:19 -0700 (PDT)
Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com
	[209.85.212.179]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
	(No client certificate requested)
	by olra.theworths.org (Postfix) with ESMTPS id 1F7D2431FAE
	for <notmuch@notmuchmail.org>; Sun,  3 Jun 2012 04:46:19 -0700 (PDT)
Received: by wibhr14 with SMTP id hr14so1550185wib.2
	for <notmuch@notmuchmail.org>; Sun, 03 Jun 2012 04:46:16 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
	h=from:to:cc:subject:date:message-id:x-mailer;
	bh=R0yeUDLkrlE9GUbSEDNAeQ+4CTNvKsZ/sJYHuQzTfXU=;
	b=YOaEBq13e+gTyIq7oBVlyshCuBuHsVT4yVqedSo1EvNM/JRmcCokRFa4f37ibpj3ek
	KEvcgooTolmnMgLP7DoG2mGyhpsRhn7fxwzRFBCn932OQOywvBuolASvHJ35a2z3pm/m
	sY3Xru7lbhOYjVBAty/6d4JyM2NbdB8qSLU5CVH37i7tkBcdFKZD0EF3spLLPx8yOtL+
	r9H62xf0kSN1YfIuRewxCXMBtFOB2vSfSA0CXGkxXXvQlfYOMNSvY/sspSpm9zSd+8S8
	7SLsg9Xh5+IIPbgOFIT+9YDBnGNr+CYvhEbPM5Wl2/vOEXsmfe8vMDHh/bsdJTVKcddH
	hn/Q==
Received: by 10.216.26.201 with SMTP id c51mr6768844wea.108.1338723976314;
	Sun, 03 Jun 2012 04:46:16 -0700 (PDT)
Received: from localhost (94-192-233-223.zone6.bethere.co.uk.
 [94.192.233.223])	by mx.google.com with ESMTPS id
 gv7sm12137347wib.4.2012.06.03.04.46.14	(version=TLSv1/SSLv3 cipher=OTHER);
	Sun, 03 Jun 2012 04:46:15 -0700 (PDT)
From: Mark Walters <markwalters1009@gmail.com>
To: notmuch@notmuchmail.org
Subject: [Patch v7 0/6] Allow JSON to use non-entire thread, and use for elide
Date: Sun,  3 Jun 2012 12:46:06 +0100
Message-Id: <1338723972-13063-1-git-send-email-markwalters1009@gmail.com>
X-Mailer: git-send-email 1.7.9.1
X-BeenThere: notmuch@notmuchmail.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: "Use and development of the notmuch mail system."
	<notmuch.notmuchmail.org>
List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
List-Archive: <http://notmuchmail.org/pipermail/notmuch>
List-Post: <mailto:notmuch@notmuchmail.org>
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
X-List-Received-Date: Sun, 03 Jun 2012 11:46:20 -0000

This is version 7 of this patch set: the previous version is at
id:"1338106946-7611-1-git-send-email-markwalters1009@gmail.com".

I have fixed the whitespace errors, and simplified the logic in
notmuch-show.c as suggested by Peter.

I did not update the error output string as what is there is
consistent with the other error cases. However, I have a followup
patch which rejigs the error handling considerably, as there are some
other oddities: for example currently 

notmuch show --part id:<a message>

(with no number to "part") silently fails. It is a very simple but
relatively large patch: I will post it as a reply to this thread but
it is not logically part of the series (although it touches a lot of
the same code).

Best wishes

Mark

Mark Walters (6):
  cli: command line parsing: allow default for keyword options
  cli: Let json output "null" messages for non --entire-thread
  cli: make --entire-thread=false work for format=json.
  Update devel/schemata for --entire-thread=false
  emacs: make elide messages use notmuch-show for omitting messages.
  cli: notmuch-show.c fix whitespace error

 command-line-arguments.c |   17 +++++++++++---
 devel/TODO               |    2 -
 devel/schemata           |    2 +-
 emacs/notmuch-show.el    |   18 ++++++++------
 notmuch-client.h         |    1 +
 notmuch-show.c           |   55 +++++++++++++++++++++++++++++++++++++--------
 6 files changed, 70 insertions(+), 25 deletions(-)

-- 
1.7.9.1