[PATCH 2/3] emacs: Use S-exp format everywhere

diff --git a/b8/4570b7e58ceefa2440604bdf89a9b5e92c1ae1 b/b8/4570b7e58ceefa2440604bdf89a9b5e92c1ae1
new file mode 100644 (file)
index 0000000..f036455
--- /dev/null
+++ b/b8/4570b7e58ceefa2440604bdf89a9b5e92c1ae1
@@ -0,0 +1,137 @@
+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 0BF4F431FBD\r
+       for <notmuch@notmuchmail.org>; Sun, 23 Jun 2013 16:43:37 -0700 (PDT)\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 Sbk0dXkjp6CL for <notmuch@notmuchmail.org>;\r
+       Sun, 23 Jun 2013 16:43:29 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-2.mit.edu (dmz-mailsec-scanner-2.mit.edu\r
+       [18.9.25.13])\r
+       by olra.theworths.org (Postfix) with ESMTP id DC8DF431FB6\r
+       for <notmuch@notmuchmail.org>; Sun, 23 Jun 2013 16:43:28 -0700 (PDT)\r
+X-AuditID: 1209190d-b7f078e000000937-9c-51c78820db61\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+       by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 32.DD.02359.02887C15; Sun, 23 Jun 2013 19:43:28 -0400 (EDT)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+       by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id r5NNhP6J025545; \r
+       Sun, 23 Jun 2013 19:43:26 -0400\r
+Received: from drake.dyndns.org\r
+       (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [216.15.114.40]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id r5NNhNWN023368\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sun, 23 Jun 2013 19:43:25 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1UqtwJ-0000L4-Ul; Sun, 23 Jun 2013 19:43:23 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/3] emacs: Use S-exp format everywhere\r
+Date: Sun, 23 Jun 2013 19:43:18 -0400\r
+Message-Id: <1372030999-1262-2-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1372030999-1262-1-git-send-email-amdragon@mit.edu>\r
+References: <1372030999-1262-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrEIsWRmVeSWpSXmKPExsUixCmqrKvQcTzQ4MhnaYvrN2cyOzB6PFt1\r
+       izmAMYrLJiU1J7MstUjfLoErY/ehVpaC18IVf7ZOZW1gXCTQxcjJISFgIvH3xQtGCFtM4sK9\r
+       9WxdjFwcQgL7GCUab6xkgXA2Mkp82/wWyrnDJLG+4RgjhDOXUeL9lmOsIP1sAhoS2/YvB5sl\r
+       IiAtsfPubKA4BwezgJrEny4VkLCwgLlE9/oDzCA2i4CqxKm+NWDlvAL2ElvProE6Q1Gi+9kE\r
+       NhCbU8BB4v+PiewgY4SAauauSJrAyL+AkWEVo2xKbpVubmJmTnFqsm5xcmJeXmqRrpFebmaJ\r
+       XmpK6SZGcNBI8u5gfHdQ6RCjAAejEg/vD8vjgUKsiWXFlbmHGCU5mJREec+3AIX4kvJTKjMS\r
+       izPii0pzUosPMUpwMCuJ8PZaAeV4UxIrq1KL8mFS0hwsSuK8ord2BgoJpCeWpGanphakFsFk\r
+       ZTg4lCR4P7cBNQoWpaanVqRl5pQgpJk4OEGG8wANZ24HGV5ckJhbnJkOkT/FqCglzvsTpFkA\r
+       JJFRmgfXC4vqV4ziQK8I814EqeIBJgS47ldAg5mABk9OBRtckoiQkmpgtGQMeSz7c5Z6zE3z\r
+       M2yVfLPUCmbc6M956j+1jpF11vz4osKLEx8U8qr1B3zbtGCTUcnSsDf/jBSZN3Fxr58SrcVb\r
+       4ln5weui1evcA057MmclOy/iEzzjXOzD6Lr2hVdMxLrc96ozc58vdHsxn/luxo25c3cfXsuy\r
+       2iZEmjfptl2D6UuVJya/lFiKMxINtZiLihMBJIbCZsUCAAA=\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, 23 Jun 2013 23:43:37 -0000\r
+\r
+This switches `notmuch-mua-reply' and `notmuch-query-get-threads' to\r
+the S-exp format.  These were the last two uses of the JSON format in\r
+the Emacs frontend.\r
+---\r
+ emacs/notmuch-mua.el   |    4 ++--\r
+ emacs/notmuch-query.el |    4 ++--\r
+ test/emacs-show        |    2 +-\r
+ 3 files changed, 5 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+index 24eebff..329d342 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" "--format-version=1"))\r
++  (let ((args '("reply" "--format=sexp" "--format-version=1"))\r
+       reply\r
+       original)\r
+     (when notmuch-show-process-crypto\r
+@@ -158,7 +158,7 @@ list."\r
+     (setq args (append args (list query-string)))\r
+ \r
+     ;; Get the reply object as JSON, and parse it into an elisp object.\r
+-    (setq reply (apply #'notmuch-call-notmuch-json args))\r
++    (setq reply (apply #'notmuch-call-notmuch-sexp args))\r
+ \r
+     ;; Extract the original message to simplify the following code.\r
+     (setq original (plist-get reply :original))\r
+diff --git a/emacs/notmuch-query.el b/emacs/notmuch-query.el\r
+index 6e9f406..51d427f 100644\r
+--- a/emacs/notmuch-query.el\r
++++ b/emacs/notmuch-query.el\r
+@@ -29,11 +29,11 @@ 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" "--format-version=1")))\r
++  (let ((args '("show" "--format=sexp" "--format-version=1")))\r
+     (if notmuch-show-process-crypto\r
+       (setq args (append args '("--decrypt"))))\r
+     (setq args (append args search-terms))\r
+-    (apply #'notmuch-call-notmuch-json args)))\r
++    (apply #'notmuch-call-notmuch-sexp args)))\r
+ \r
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;\r
+ ;; Mapping functions across collections of messages.\r
+diff --git a/test/emacs-show b/test/emacs-show\r
+index 9f2ccb0..ae70053 100755\r
+--- a/test/emacs-show\r
++++ b/test/emacs-show\r
+@@ -189,7 +189,7 @@ This is an error (see *Notmuch errors* for more details)\r
+ ---\r
+ [XXX]\r
+ This is an error\r
+-command: $PWD/notmuch_fail show --format\\=json --format-version\\=1 --exclude\\=false \\' \\* \\'\r
++command: $PWD/notmuch_fail show --format\\=sexp --format-version\\=1 --exclude\\=false \\' \\* \\'\r
+ exit status: 1\r
+ stderr:\r
+ This is an error\r
+-- \r
+1.7.10.4\r
+\r