--- /dev/null
+Return-Path: <markwalters1009@gmail.com>\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 517B4431FC2\r
+ for <notmuch@notmuchmail.org>; Tue, 13 May 2014 05:17:03 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+ tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+ RCVD_IN_DNSWL_LOW=-0.7] 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 aFFTMqPlxuWk for <notmuch@notmuchmail.org>;\r
+ Tue, 13 May 2014 05:16:55 -0700 (PDT)\r
+Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com\r
+ [209.85.212.173]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 70E4C431FBD\r
+ for <notmuch@notmuchmail.org>; Tue, 13 May 2014 05:16:55 -0700 (PDT)\r
+Received: by mail-wi0-f173.google.com with SMTP id bs8so6115019wib.12\r
+ for <notmuch@notmuchmail.org>; Tue, 13 May 2014 05:16:54 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+ h=from:to:subject:in-reply-to:references:user-agent:date:message-id\r
+ :mime-version:content-type;\r
+ bh=agOutuO4LEkd8vEQLt8lrsuTWDuHdqohJo1M5eQaeKA=;\r
+ b=LhbcRADP9FrpacrlCtoCx+8SSxChVWKR09qH/Fn9EFK3P5SlnV8vMelK9GE5a0qinc\r
+ LMFBVXFftFaY4K6vCPQ5cXDtut2kYlG2gPZ8En4mQkJrr44LZ6N1a0wM/mFV78TGyBqc\r
+ b6d1W90UZWG92s5OPoTjn4HEq9AzErpf0jT2aEmlpt2MJRKrMsPu/s+Km4qDfNBV7AxR\r
+ T4D6fAfBY0GgjPHdVhh1e667KlaV7mZKo+6rfXdmvlAUkWCqoI812frd5nKFrLZ6yPHC\r
+ Oe1Yg7Ag8CDxviJZQLVAWMlpo5hRGqn0/fz6uV3AqmyI8CsKuDKjOycuudkshutry6yl\r
+ Bm0A==\r
+X-Received: by 10.194.88.230 with SMTP id bj6mr604618wjb.85.1399983414082;\r
+ Tue, 13 May 2014 05:16:54 -0700 (PDT)\r
+Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162])\r
+ by mx.google.com with ESMTPSA id\r
+ pj5sm21624701wic.20.2014.05.13.05.16.53 for <multiple recipients>\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Tue, 13 May 2014 05:16:53 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: David Edmondson <dme@dme.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v3 7/9] test: Update the test output to accord with the\r
+ reply changes\r
+In-Reply-To: <1399897769-26809-8-git-send-email-dme@dme.org>\r
+References: <87sixdujkv.fsf@qmul.ac.uk>\r
+ <1399897769-26809-1-git-send-email-dme@dme.org>\r
+ <1399897769-26809-8-git-send-email-dme@dme.org>\r
+User-Agent: Notmuch/0.15.2+615~g78e3a93 (http://notmuchmail.org) Emacs/23.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Tue, 13 May 2014 13:16:52 +0100\r
+Message-ID: <87vbt9j2kr.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\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: Tue, 13 May 2014 12:17:04 -0000\r
+\r
+On Mon, 12 May 2014, David Edmondson <dme@dme.org> wrote:\r
+> Replying to a message with multiple parts will now typically include\r
+> content from several parts (whereas previously only the first part was\r
+> used). Update the expected output from the emacs reply tests\r
+> accordingly.\r
+\r
+I will reply here rather than to id:cunr43y56wy.fsf@hotblack-desiato.hh.sledj.net\r
+\r
+My point was that the change in this test is not because we are now\r
+looking beyond the first part. It is because a part with content-type\r
+application/octet-stream (which we didn't include in replies in the old\r
+scheme, and wouldn't generally in the new scheme) is redesignated by\r
+notmuch-show as a content-type text/x-diff, and thus displayed in the\r
+buffer. Hence the new code includes it in the reply.\r
+\r
+You can see this more clearly in patch 9/9 when this part gets a header button\r
+\r
++> [ 0001-Deal-with-situation-where-sysconf-_SC_GETPW_R_SIZE_M.patch: application/octet-stream (as text/x-diff) ]\r
+\r
+Anyway, my point is that this is a *good* thing: the change is not a\r
+large intrusive thing of showing lots more parts (as this commit message\r
+sort of suggests) but a small change of it now correctly including a\r
+part which got sent with the wrong content-type.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+\r
+\r
+> ---\r
+> test/T310-emacs.sh | 32 ++++++++++++++++++++++++++++++++\r
+> 1 file changed, 32 insertions(+)\r
+>\r
+> diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh\r
+> index ac966e5..95bb67e 100755\r
+> --- a/test/T310-emacs.sh\r
+> +++ b/test/T310-emacs.sh\r
+> @@ -473,6 +473,38 @@ Alex Botero-Lowry <alex.boterolowry@gmail.com> writes:\r
+> > and http://mail-index.netbsd.org/pkgsrc-bugs/2006/06/07/msg016808.htmlspecifically\r
+> > uses 64 as the\r
+> > buffer size.\r
+> +> From e3bc4bbd7b9d0d086816ab5f8f2d6ffea1dd3ea4 Mon Sep 17 00:00:00 2001\r
+> +> From: Alexander Botero-Lowry <alex.boterolowry@gmail.com>\r
+> +> Date: Tue, 17 Nov 2009 11:30:39 -0800\r
+> +> Subject: [PATCH] Deal with situation where sysconf(_SC_GETPW_R_SIZE_MAX) returns -1\r
+> +>\r
+> +> ---\r
+> +> notmuch-config.c | 2 ++\r
+> +> 1 files changed, 2 insertions(+), 0 deletions(-)\r
+> +>\r
+> +> diff --git a/notmuch-config.c b/notmuch-config.c\r
+> +> index 248149c..e7220d8 100644\r
+> +> --- a/notmuch-config.c\r
+> +> +++ b/notmuch-config.c\r
+> +> @@ -77,6 +77,7 @@ static char *\r
+> +> get_name_from_passwd_file (void *ctx)\r
+> +> {\r
+> +> long pw_buf_size = sysconf(_SC_GETPW_R_SIZE_MAX);\r
+> +> + if (pw_buf_size == -1) pw_buf_size = 64;\r
+> +> char *pw_buf = talloc_zero_size (ctx, pw_buf_size);\r
+> +> struct passwd passwd, *ignored;\r
+> +> char *name;\r
+> +> @@ -101,6 +102,7 @@ static char *\r
+> +> get_username_from_passwd_file (void *ctx)\r
+> +> {\r
+> +> long pw_buf_size = sysconf(_SC_GETPW_R_SIZE_MAX);\r
+> +> + if (pw_buf_size == -1) pw_buf_size = 64;\r
+> +> char *pw_buf = talloc_zero_size (ctx, pw_buf_size);\r
+> +> struct passwd passwd, *ignored;\r
+> +> char *name;\r
+> +> -- \r
+> +> 1.6.5.2\r
+> +>\r
+> > _______________________________________________\r
+> > notmuch mailing list\r
+> > notmuch@notmuchmail.org\r
+> -- \r
+> 2.0.0.rc0\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r