From 20732f3f25fe40b0df01d918015719c57c101c55 Mon Sep 17 00:00:00 2001
From: Tomi Ollila <tomi.ollila@iki.fi>
Date: Tue, 10 Mar 2015 10:03:44 +0200
Subject: [PATCH] Re: [PATCH 1/2] cli: fix top level --help combined with other
 options

---
 a4/9c6d938890908967de963e74d73d201dbf76e5 | 72 +++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 a4/9c6d938890908967de963e74d73d201dbf76e5

diff --git a/a4/9c6d938890908967de963e74d73d201dbf76e5 b/a4/9c6d938890908967de963e74d73d201dbf76e5
new file mode 100644
index 000000000..f75c2998a
--- /dev/null
+++ b/a4/9c6d938890908967de963e74d73d201dbf76e5
@@ -0,0 +1,72 @@
+Return-Path: <tomi.ollila@iki.fi>
+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 84C46431FAF
+	for <notmuch@notmuchmail.org>; Tue, 10 Mar 2015 01:04:13 -0700 (PDT)
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
+X-Spam-Flag: NO
+X-Spam-Score: 2.438
+X-Spam-Level: **
+X-Spam-Status: No, score=2.438 tagged_above=-999 required=5
+	tests=[DNS_FROM_AHBL_RHSBL=2.438] 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 cEIcig4d4-NC for <notmuch@notmuchmail.org>;
+	Tue, 10 Mar 2015 01:04:10 -0700 (PDT)
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
+	by olra.theworths.org (Postfix) with ESMTP id 33E75431FAE
+	for <notmuch@notmuchmail.org>; Tue, 10 Mar 2015 01:04:10 -0700 (PDT)
+Received: from guru.guru-group.fi (localhost [IPv6:::1])
+	by guru.guru-group.fi (Postfix) with ESMTP id 6C554100033;
+	Tue, 10 Mar 2015 10:03:44 +0200 (EET)
+From: Tomi Ollila <tomi.ollila@iki.fi>
+To: David Bremner <david@tethera.net>, Jani Nikula <jani@nikula.org>,
+	notmuch@notmuchmail.org
+Subject: Re: [PATCH 1/2] cli: fix top level --help combined with other options
+In-Reply-To: <87egoytzsm.fsf@maritornes.cs.unb.ca>
+References: <1425831535-15920-1-git-send-email-jani@nikula.org>
+	<87egoytzsm.fsf@maritornes.cs.unb.ca>
+User-Agent: Notmuch/0.19+53~gb45d2f9 (http://notmuchmail.org) Emacs/24.3.1
+	(x86_64-unknown-linux-gnu)
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL
+	$[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F
+	!)g;OY^,BjTbr)Np:%c_o'jj,Z
+Date: Tue, 10 Mar 2015 10:03:44 +0200
+Message-ID: <m2twxtb7of.fsf@guru.guru-group.fi>
+MIME-Version: 1.0
+Content-Type: text/plain
+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, 10 Mar 2015 08:04:13 -0000
+
+On Mon, Mar 09 2015, David Bremner <david@tethera.net> wrote:
+
+> Jani Nikula <jani@nikula.org> writes:
+>
+>> -	ret = notmuch_help_command (NULL, argc - 1, &argv[1]);
+>> +	/*
+>> +	 * Pass the first positional argument as argv[1] so the help
+>> +	 * command can give help for it. The help command ignores the
+>> +	 * argv[0] passed to it.
+>> +	 */
+>> +	ret = notmuch_help_command (NULL, argc - opt_index + 1,
+>> +				    argv + opt_index - 1);
+>>  	goto DONE;
+>>      }
+>
+> LGTM
+
+Also to me, too.
+
+Tomi
-- 
2.26.2