This fixes the test failure. I didn't have dtach installed, so the tests were being skipped earlier. As to why the test fails, it appears that the default for message-cite-function may depend on the version of Emacs that you use.
This will likely cause notmuch replying to behave differently for users if they upgrade, even if they don't customize message-cite-function (in the case that it is not message-cite-original). Regarding the quotation changes in the test, it was not being interpreted correctly without the double quotes. I didn't look into it in much depth, just fixed it for my case. - Todd --- emacs/notmuch-mua.el | 6 +++--- test/T310-emacs.sh | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el index 2c58886..66a6b65 100644 --- a/emacs/notmuch-mua.el +++ b/emacs/notmuch-mua.el @@ -220,8 +220,8 @@ list." (date (plist-get original-headers :Date)) (start (point))) - ;; message-cite-original constructs a citation line based on the From and Date - ;; headers of the original message, which are assumed to be in the buffer. + ;; message-cite-function should construct a citation line based on the From and + ;; Date headers of the original message, which are assumed to be in the buffer. (insert "From: " from "\n") (insert "Date: " date "\n\n") @@ -233,7 +233,7 @@ list." (set-mark (point)) (goto-char start) ;; Quote the original message according to the user's configured style. - (message-cite-original))) + (funcall (or message-cite-function 'message-cite-original)))) ;; Crypto processing based crypto content of the original message (when process-crypto diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh index d72799b..74d9f58 100755 --- a/test/T310-emacs.sh +++ b/test/T310-emacs.sh @@ -378,10 +378,11 @@ EOF test_expect_equal_file OUTPUT EXPECTED test_begin_subtest "Reply within emacs to a multipart/mixed message" -test_emacs '(let ((message-hidden-headers ''())) - (notmuch-show "id:20091118002059.067214ed at hikari") +test_emacs "(let ((message-hidden-headers '()) + (message-cite-function 'message-cite-original)) + (notmuch-show \"id:20091118002059.067214ed at hikari\") (notmuch-show-reply) - (test-output))' + (test-output))" sed -i -e 's,^User-Agent: Notmuch/.* Emacs/.*,User-Agent: Notmuch/XXX Emacs/XXX,' OUTPUT cat <<EOF >EXPECTED From: Notmuch Test Suite <test_suite at notmuchmail.org> -- 1.9.1