On Mon, 12 May 2014, David Edmondson <dme at dme.org> wrote: > Replying to a message with multiple parts will now typically include > content from several parts (whereas previously only the first part was > used). Update the expected output from the emacs reply tests > accordingly.
I will reply here rather than to id:cunr43y56wy.fsf at hotblack-desiato.hh.sledj.net My point was that the change in this test is not because we are now looking beyond the first part. It is because a part with content-type application/octet-stream (which we didn't include in replies in the old scheme, and wouldn't generally in the new scheme) is redesignated by notmuch-show as a content-type text/x-diff, and thus displayed in the buffer. Hence the new code includes it in the reply. You can see this more clearly in patch 9/9 when this part gets a header button +> [ 0001-Deal-with-situation-where-sysconf-_SC_GETPW_R_SIZE_M.patch: application/octet-stream (as text/x-diff) ] Anyway, my point is that this is a *good* thing: the change is not a large intrusive thing of showing lots more parts (as this commit message sort of suggests) but a small change of it now correctly including a part which got sent with the wrong content-type. Best wishes Mark > --- > test/T310-emacs.sh | 32 ++++++++++++++++++++++++++++++++ > 1 file changed, 32 insertions(+) > > diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh > index ac966e5..95bb67e 100755 > --- a/test/T310-emacs.sh > +++ b/test/T310-emacs.sh > @@ -473,6 +473,38 @@ Alex Botero-Lowry <alex.boterolowry at gmail.com> writes: > > and > http://mail-index.netbsd.org/pkgsrc-bugs/2006/06/07/msg016808.htmlspecifically > > uses 64 as the > > buffer size. > +> From e3bc4bbd7b9d0d086816ab5f8f2d6ffea1dd3ea4 Mon Sep 17 00:00:00 2001 > +> From: Alexander Botero-Lowry <alex.boterolowry at gmail.com> > +> Date: Tue, 17 Nov 2009 11:30:39 -0800 > +> Subject: [PATCH] Deal with situation where sysconf(_SC_GETPW_R_SIZE_MAX) > returns -1 > +> > +> --- > +> notmuch-config.c | 2 ++ > +> 1 files changed, 2 insertions(+), 0 deletions(-) > +> > +> diff --git a/notmuch-config.c b/notmuch-config.c > +> index 248149c..e7220d8 100644 > +> --- a/notmuch-config.c > +> +++ b/notmuch-config.c > +> @@ -77,6 +77,7 @@ static char * > +> get_name_from_passwd_file (void *ctx) > +> { > +> long pw_buf_size = sysconf(_SC_GETPW_R_SIZE_MAX); > +> + if (pw_buf_size == -1) pw_buf_size = 64; > +> char *pw_buf = talloc_zero_size (ctx, pw_buf_size); > +> struct passwd passwd, *ignored; > +> char *name; > +> @@ -101,6 +102,7 @@ static char * > +> get_username_from_passwd_file (void *ctx) > +> { > +> long pw_buf_size = sysconf(_SC_GETPW_R_SIZE_MAX); > +> + if (pw_buf_size == -1) pw_buf_size = 64; > +> char *pw_buf = talloc_zero_size (ctx, pw_buf_size); > +> struct passwd passwd, *ignored; > +> char *name; > +> -- > +> 1.6.5.2 > +> > > _______________________________________________ > > notmuch mailing list > > notmuch at notmuchmail.org > -- > 2.0.0.rc0 > > _______________________________________________ > notmuch mailing list > notmuch at notmuchmail.org > http://notmuchmail.org/mailman/listinfo/notmuch