Return-Path: <bremner@unb.ca>
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 C6741431FB6
	for <notmuch@notmuchmail.org>; Tue, 24 Jul 2012 09:33:51 -0700 (PDT)
X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
X-Spam-Flag: NO
X-Spam-Score: 0
X-Spam-Level: 
X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
	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 q0x3R-gQTTiN for <notmuch@notmuchmail.org>;
	Tue, 24 Jul 2012 09:33:51 -0700 (PDT)
Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])
	(using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested)
	by olra.theworths.org (Postfix) with ESMTPS id 5482F431FAE
	for <notmuch@notmuchmail.org>; Tue, 24 Jul 2012 09:33:51 -0700 (PDT)
Received: from fctnnbsc30w-156034089108.dhcp-dynamic.fibreop.nb.bellaliant.net
	([156.34.89.108] helo=zancas.localnet)
	by tesseract.cs.unb.ca with esmtpsa
	(TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)
	(envelope-from <bremner@unb.ca>)
	id 1Sti3P-0006Ms-Ny; Tue, 24 Jul 2012 13:33:47 -0300
Received: from bremner by zancas.localnet with local (Exim 4.80)
	(envelope-from <bremner@unb.ca>)
	id 1Sti3K-0004gx-3e; Tue, 24 Jul 2012 13:33:42 -0300
From: David Bremner <david@tethera.net>
To: Mark Walters <markwalters1009@gmail.com>, notmuch@notmuchmail.org
Subject: Re: [PATCH v2 0/4] Add a --body option to notmuch show
In-Reply-To: <1343066259-22523-1-git-send-email-markwalters1009@gmail.com>
References: <1343066259-22523-1-git-send-email-markwalters1009@gmail.com>
User-Agent: Notmuch/0.13.2 (http://notmuchmail.org) Emacs/23.4.1
	(x86_64-pc-linux-gnu)
Date: Tue, 24 Jul 2012 13:33:34 -0300
Message-ID: <87sjcht8yp.fsf@zancas.localnet>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Spam_bar: -
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: Tue, 24 Jul 2012 16:33:52 -0000

Mark Walters <markwalters1009@gmail.com> writes:

> Version 2 of this patch set (version 1 at
> id:"1343060241-18283-1-git-send-email-markwalters1009@gmail.com"). This
> corrects the errors Austin spotted in v1, and makes it explicit that
> --body=false and --part>0 are incompatible.

2/4 doesn't apply anymore to current master, and I was a bit leery of
resolving conflicts in the tests; can you rebase and resend? no need for
review of the rebased series.

d