This sets the part-insertion code to never insert part headers (as we didn't before). With that change there is only one failing test: this test has a text part (an email message) listed as application/octet-stream. Notmuch show displays this part, but the reply code omitted it as it had type application/octet-stream. The new code correctly includes it. Thus update the expected output to match. --- test/T310-emacs.sh | 32 ++++++++++++++++++++++++++++++++ test/test-lib.el | 4 ++++ 2 files changed, 36 insertions(+) diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh index 61bc369..22ca71c 100755 --- a/test/T310-emacs.sh +++ b/test/T310-emacs.sh @@ -473,6 +473,38 @@ Alex Botero-Lowry <alex.boterolowry@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@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@notmuchmail.org diff --git a/test/test-lib.el b/test/test-lib.el index 596a705..02e020c 100644 --- a/test/test-lib.el +++ b/test/test-lib.el @@ -184,6 +184,10 @@ nothing." (setq notmuch-tag-deleted-formats '((".*" nil))) +;; For historical reasonse we don't print part headers when replying +;; in the tests suite +(setq notmuch-mua-reply-insert-header-p-function 'notmuch-show-reply-insert-header-p-never) + ;; force a common html renderer, to avoid test variations between ;; environments -- 2.1.4