From: Adam Wolfe Gordon Date: Wed, 15 Feb 2012 05:00:23 +0000 (+1700) Subject: [PATCH v5 0/4] Reply enhancements (was: quoting HTML email ...) X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=80f8735a0987bcddc9b60e8fca91cceb3cc8f280;p=notmuch-archives.git [PATCH v5 0/4] Reply enhancements (was: quoting HTML email ...) --- diff --git a/41/de649d24a2184e040a84de72bf4206cd82d55b b/41/de649d24a2184e040a84de72bf4206cd82d55b new file mode 100644 index 000000000..dd8407a82 --- /dev/null +++ b/41/de649d24a2184e040a84de72bf4206cd82d55b @@ -0,0 +1,109 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 38A28431FBF + for ; Tue, 14 Feb 2012 21:00:43 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id YmFy0ZYQv4Lh for ; + Tue, 14 Feb 2012 21:00:42 -0800 (PST) +Received: from smtp-out-04.shaw.ca (smtp-out-04.shaw.ca [64.59.134.12]) + by olra.theworths.org (Postfix) with ESMTP id 6E57E431FBD + for ; Tue, 14 Feb 2012 21:00:42 -0800 (PST) +Received: from lb7f8hsrpno-svcs.dcs.int.inet (HELO pd5ml3no-ssvc.prod.shaw.ca) + ([10.0.144.222]) + by pd5mo1no-svcs.prod.shaw.ca with ESMTP; 14 Feb 2012 22:00:41 -0700 +X-Cloudmark-SP-Filtered: true +X-Cloudmark-SP-Result: v=1.1 cv=TH029eDfZHqIRue7hhxWRjZ7JL4S9vo/jJY5vkv2d5E= + c=1 sm=1 + a=oz4yHJstQ4QA:10 a=BLceEmwcHowA:10 a=yQp6g8lIsgqumF79BAsFDg==:17 + a=y3FsA9EK9nUvDaqFHiAA:9 a=ez9Q0DsB6V5r5XYGvRMA:7 a=odvB31Xb1hMA:10 + a=HpAAvcLHHh0Zw7uRqdWCyQ==:117 +Received: from unknown (HELO lagos.xvx.ca) ([96.52.216.56]) + by pd5ml3no-dmz.prod.shaw.ca with ESMTP; 14 Feb 2012 22:00:41 -0700 +Received: by lagos.xvx.ca (Postfix, from userid 1000) + id 546118004EBA; Tue, 14 Feb 2012 22:00:40 -0700 (MST) +From: Adam Wolfe Gordon +To: notmuch@notmuchmail.org, + amdragon@mit.edu +Subject: [PATCH v5 0/4] Reply enhancements (was: quoting HTML email ...) +Date: Tue, 14 Feb 2012 22:00:23 -0700 +Message-Id: <1329282027-29457-1-git-send-email-awg+notmuch@xvx.ca> +X-Mailer: git-send-email 1.7.5.4 +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Wed, 15 Feb 2012 05:00:43 -0000 + +Hi everyone, + +There are relatively few changes from the last version [1], but the JSON +format has big changes again. A summary of all the changes: + +* The JSON reply format now uses the new formatter from the show JSON + format. This means that the MUA will not need to call notmuch show + for text/* parts, except HTML, as the content of those parts will be + included in the JSON output. + +* The JSON reply format has changed in a few other minor ways, due to + reusing the show code. + +* Because the original message is now included in the reply format, the + old show behavior of --format=json implies --entire-thread is reinstated. + I still think this is a weird behavior, but there's no good reason to + change it. + +* The emacs code is simplified a bit by the changes to the JSON format, but + its behavior is basically the same. + +* Man pages and tests changed to reflect the above changes. + +Note that, as implied above, this series relies on Austin's rewrite of the +show JSON formatter [2]. I should probably add the reply JSON format to +the devel/schemata file, but I'll leave that for another patch (perhaps +in a series with a news entry if this is deemed ready to push). + +Thanks to everyone for the replies on previous versions, and please let +me know if you have any comments. Also, it would be great if others can +test this out on some interesting messages, as my email collection is +not very esoteric. + +[1] id:"1328746916-25447-1-git-send-email-awg+notmuch@xvx.ca" +[2] id:"1329240823-7856-1-git-send-email-amdragon@mit.edu" + +Adam Wolfe Gordon (4): + test: Add broken test for the new JSON reply format. + reply: Add a JSON reply format. + man: Update notmuch-reply man page for JSON format. + emacs: Use the new JSON reply format and message-cite-original + + emacs/notmuch-lib.el | 39 +++++++++++ + emacs/notmuch-mua.el | 123 +++++++++++++++++++++++++---------- + emacs/notmuch-show.el | 24 +------ + man/man1/notmuch-reply.1 | 5 ++ + notmuch-client.h | 3 + + notmuch-reply.c | 164 ++++++++++++++++++++++++++++++++++------------ + notmuch-show.c | 2 +- + test/emacs | 101 ++++++++++++++++++++++++++++- + test/multipart | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 9 files changed, 365 insertions(+), 103 deletions(-) + +-- +1.7.5.4 +