Hi everyone, This is a resend of [1], rebased onto the current master. I've also moved the NEWS items into the new 0.13 section, as David requested. [1] id:"1331699416-30775-1-git-send-email-awg+notmuch@xvx.ca" Adam Wolfe Gordon (11): test: Add broken test for the new JSON reply format. reply: Factor out reply creation TODO: Add replying to multiple messages reply: Add a JSON reply format. schemata: Add documentation for JSON reply format. man: Update notmuch-reply man page for JSON format. man: Add --decrypt to reply flags emacs: Factor out useful functions into notmuch-lib test: Add broken tests for new emacs reply functionality emacs: Use the new JSON reply format and message-cite-original NEWS: news for reply enhancements NEWS | 33 ++++++++++ devel/TODO | 8 +++ devel/schemata | 27 ++++++++- emacs/notmuch-lib.el | 63 +++++++++++++++++++ emacs/notmuch-mua.el | 124 +++++++++++++++++++++++++------------ emacs/notmuch-show.el | 55 +++-------------- man/man1/notmuch-reply.1 | 20 ++++++- notmuch-client.h | 12 +++- notmuch-reply.c | 153 +++++++++++++++++++++++++++++++++------------- notmuch-show.c | 29 ++++++--- test/emacs | 101 ++++++++++++++++++++++++++++++- test/multipart | 52 ++++++++++++++++ 12 files changed, 530 insertions(+), 147 deletions(-) -- 1.7.5.4