[PATCH v4 0/4] Quoting HTML parts in reply (and other reply enhancements)

diff --git a/a7/4632e7a5610a35f56f1c471ea8d2b26cc9554e b/a7/4632e7a5610a35f56f1c471ea8d2b26cc9554e
new file mode 100644 (file)
index 0000000..c4c4607
--- /dev/null
+++ b/a7/4632e7a5610a35f56f1c471ea8d2b26cc9554e
@@ -0,0 +1,111 @@
+Return-Path: <awg@lagos.xvx.ca>\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 6E6A6431FAE\r
+       for <notmuch@notmuchmail.org>; Wed,  8 Feb 2012 16:22:09 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 4oAH+LfMdr6N for <notmuch@notmuchmail.org>;\r
+       Wed,  8 Feb 2012 16:22:08 -0800 (PST)\r
+Received: from smtp-out-04.shaw.ca (smtp-out-04.shaw.ca [64.59.134.12])\r
+       by olra.theworths.org (Postfix) with ESMTP id 71D51431FAF\r
+       for <notmuch@notmuchmail.org>; Wed,  8 Feb 2012 16:22:08 -0800 (PST)\r
+Received: from lb7f8hsrpno-svcs.dcs.int.inet (HELO pd6ml3no-ssvc.prod.shaw.ca)\r
+       ([10.0.144.222])\r
+       by pd5mo1no-svcs.prod.shaw.ca with ESMTP; 08 Feb 2012 17:22:07 -0700\r
+X-Cloudmark-SP-Filtered: true\r
+X-Cloudmark-SP-Result: v=1.1 cv=gFGh1ScE7ROJHT2jhivHYaSHya8441O0LZB7wkhlVyo=\r
+       c=1 sm=1\r
+       a=CMkXlkAlBFUA:10 a=BLceEmwcHowA:10 a=yQp6g8lIsgqumF79BAsFDg==:17\r
+       a=FPbcA7frrQUDSoSD1uIA:9 a=jAR98ZH7ysiss9ynm54A:7 a=odvB31Xb1hMA:10\r
+       a=HpAAvcLHHh0Zw7uRqdWCyQ==:117\r
+Received: from unknown (HELO lagos.xvx.ca) ([96.52.216.56])\r
+       by pd6ml3no-dmz.prod.shaw.ca with ESMTP; 08 Feb 2012 17:22:07 -0700\r
+Received: by lagos.xvx.ca (Postfix, from userid 1000)\r
+       id 3262F802A3DC; Wed,  8 Feb 2012 17:22:07 -0700 (MST)\r
+From: Adam Wolfe Gordon <awg+notmuch@xvx.ca>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v4 0/4] Quoting HTML parts in reply (and other reply\r
+       enhancements)\r
+Date: Wed,  8 Feb 2012 17:21:52 -0700\r
+Message-Id: <1328746916-25447-1-git-send-email-awg+notmuch@xvx.ca>\r
+X-Mailer: git-send-email 1.7.5.4\r
+In-Reply-To: <1326995217-27423-1-git-send-email-awg+notmuch@xvx.ca>\r
+References: <1326995217-27423-1-git-send-email-awg+notmuch@xvx.ca>\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: Thu, 09 Feb 2012 00:22:09 -0000\r
+\r
+Hi everyone,\r
+\r
+Here is a new and much-improved version of my series [1] adding support for\r
+quoting HTML parts in replies using a JSON reply format. This version is, as\r
+the diffs indicate, much more ambitious than previous versions, especially\r
+on the emacs front:\r
+\r
+* The JSON reply format now only includes headers (for both the original and \r
+  reply messages), as Dmitry pointed out that non-UTF8 characters sets cannot\r
+  be properly inlined in JSON.\r
+\r
+* Thus, emacs now uses notmuch show to fetch the body of the original message\r
+  before creating the quoted body of the reply.\r
+\r
+* In order to simplify this use of show, the JSON format no longer implies\r
+  --entire-thread. The other consumer of --format=json (notmuch-query.el) has\r
+  been updated to use --entire-thread when that's what it means, and the man\r
+  page has been updated.\r
+\r
+* Emacs now pays attention to multipart structures when deciding which parts\r
+  to quote in a reply. This uses essentially the same logic as in show, some\r
+  of which has been factored out into notmuch-lib.el. In particular, emacs will\r
+  include all the text parts of a message, except the non-preferred ones in a\r
+  multipart/alternative part.\r
+\r
+* There are two new emacs test cases to test and demonstrate the new reply\r
+  functionality. They show how it works a multipart/mixed and multipart/alternative\r
+  messages.\r
+\r
+I think that covers everything... Please let me know if there is something I\r
+haven't explained well. And, of course, please send reviews on this extensive\r
+change.\r
+\r
+[1] id:"1326995217-27423-1-git-send-email-awg+notmuch@xvx.ca"\r
+\r
+Adam Wolfe Gordon (4):\r
+  test: Add broken test for the new JSON reply format.\r
+  reply: Add a JSON reply format.\r
+  man: Update notmuch-reply man page for JSON format.\r
+  emacs: Use the new JSON reply format and message-cite-original\r
+\r
+ emacs/notmuch-lib.el     |   39 +++++++++++\r
+ emacs/notmuch-mua.el     |  136 +++++++++++++++++++++++++++-----------\r
+ emacs/notmuch-query.el   |    2 +-\r
+ emacs/notmuch-show.el    |   24 +------\r
+ man/man1/notmuch-reply.1 |    5 ++\r
+ man/man1/notmuch-show.1  |    6 +--\r
+ notmuch-reply.c          |  167 ++++++++++++++++++++++++++++++++++------------\r
+ notmuch-show.c           |    1 -\r
+ test/emacs               |  101 +++++++++++++++++++++++++++-\r
+ test/multipart           |    7 ++\r
+ 10 files changed, 375 insertions(+), 113 deletions(-)\r
+\r
+-- \r
+1.7.5.4\r
+\r