[PATCH 10/10] emacs: Use --use-schema for show and reply

diff --git a/4a/89c66abfc9f8bca5561cff6de6a643cd2c471e b/4a/89c66abfc9f8bca5561cff6de6a643cd2c471e
new file mode 100644 (file)
index 0000000..97b2f19
--- /dev/null
+++ b/4a/89c66abfc9f8bca5561cff6de6a643cd2c471e
@@ -0,0 +1,106 @@
+Return-Path: <amdragon@mit.edu>\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 B772F429E44\r
+       for <notmuch@notmuchmail.org>; Sat,  1 Dec 2012 18:40:32 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 p-BTMPG8vupK for <notmuch@notmuchmail.org>;\r
+       Sat,  1 Dec 2012 18:40:31 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-6.mit.edu (DMZ-MAILSEC-SCANNER-6.MIT.EDU\r
+       [18.7.68.35])\r
+       by olra.theworths.org (Postfix) with ESMTP id DC869431FC3\r
+       for <notmuch@notmuchmail.org>; Sat,  1 Dec 2012 18:40:22 -0800 (PST)\r
+X-AuditID: 12074423-b7fcb6d000000927-c0-50babf96ff51\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+       by dmz-mailsec-scanner-6.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id C6.57.02343.69FBAB05; Sat,  1 Dec 2012 21:40:22 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id qB22eBGe013711; \r
+       Sat, 1 Dec 2012 21:40:11 -0500\r
+Received: from drake.dyndns.org\r
+       (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [209.6.116.242]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qB22e6ch025606\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sat, 1 Dec 2012 21:40:10 -0500 (EST)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1TezTS-0000xq-6Y; Sat, 01 Dec 2012 21:40:06 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 10/10] emacs: Use --use-schema for show and reply\r
+Date: Sat,  1 Dec 2012 21:40:02 -0500\r
+Message-Id: <1354416002-3557-10-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1354416002-3557-1-git-send-email-amdragon@mit.edu>\r
+References: <1354416002-3557-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrIIsWRmVeSWpSXmKPExsUixCmqrDtt/64Ag+9vZCyu35zJ7MDo8WzV\r
+       LeYAxigum5TUnMyy1CJ9uwSujO51eQVTOSv+znnF2MC4n72LkZNDQsBEYsrlE8wQtpjEhXvr\r
+       2boYuTiEBPYxSiw5ehPKWc8osb6rlxnCecgksW/OfEYIZy6jxKNV/xhB+tkENCS27V8OZosI\r
+       SEvsvDubtYuRg4NZQE3iT5cKSFhYwFHi5/7NYCUsAqoSe/d9YgWxeQUcJLqffYI6QxHInsAG\r
+       0soJFF/RzQMSFhKwl/j/+xrbBEb+BYwMqxhlU3KrdHMTM3OKU5N1i5MT8/JSi3TN9HIzS/RS\r
+       U0o3MYJCht1FeQfjn4NKhxgFOBiVeHgj5uwKEGJNLCuuzD3EKMnBpCTKe2UHUIgvKT+lMiOx\r
+       OCO+qDQntfgQowQHs5IIL4sJUI43JbGyKrUoHyYlzcGiJM57LeWmv5BAemJJanZqakFqEUxW\r
+       hoNDSYL38l6gRsGi1PTUirTMnBKENBMHJ8hwHqDh4ftAhhcXJOYWZ6ZD5E8xKkqJ8/qBJARA\r
+       EhmleXC9sJh+xSgO9IowrydIFQ8wHcB1vwIazAQ0+M2y7SCDSxIRUlINjMKfrAw//Pt9e+LP\r
+       03P+v4vfpZaW2/hDzPT2tNpV/EW9kkxTI7w3CDi9WqLVvGNaTVRJ+ivJa9N27vjA3fcxqH7P\r
+       xF82xo9f/1q8nmOKrrvsI6cfic/i5upYtyY/Tl7DtSLsJfOhfUf8VV7xK3/guW10Na593//E\r
+       eGenmec3Te+3//jujBzX189KLMUZiYZazEXFiQAgdSVgxAIAAA==\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: Sun, 02 Dec 2012 02:40:33 -0000\r
+\r
+---\r
+ emacs/notmuch-mua.el   |    2 +-\r
+ emacs/notmuch-query.el |    2 +-\r
+ 2 files changed, 2 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+index ac2d29e..0e1c7a7 100644\r
+--- a/emacs/notmuch-mua.el\r
++++ b/emacs/notmuch-mua.el\r
+@@ -146,7 +146,7 @@ list."\r
+   (unless (bolp) (insert "\n")))\r
+ \r
+ (defun notmuch-mua-reply (query-string &optional sender reply-all)\r
+-  (let ((args '("reply" "--format=json"))\r
++  (let ((args '("reply" "--format=json" "--use-schema=1"))\r
+       reply\r
+       original)\r
+     (when notmuch-show-process-crypto\r
+diff --git a/emacs/notmuch-query.el b/emacs/notmuch-query.el\r
+index e7e3520..7517aec 100644\r
+--- a/emacs/notmuch-query.el\r
++++ b/emacs/notmuch-query.el\r
+@@ -29,7 +29,7 @@ A thread is a forest or list of trees. A tree is a two element\r
+ list where the first element is a message, and the second element\r
+ is a possibly empty forest of replies.\r
+ "\r
+-  (let ((args '("show" "--format=json")))\r
++  (let ((args '("show" "--format=json" "--use-schema=1")))\r
+     (if notmuch-show-process-crypto\r
+       (setq args (append args '("--decrypt"))))\r
+     (setq args (append args search-terms))\r
+-- \r
+1.7.10.4\r
+\r