1 Return-Path: <amdragon@mit.edu>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 0BF4F431FBD
\r
6 for <notmuch@notmuchmail.org>; Sun, 23 Jun 2013 16:43:37 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id Sbk0dXkjp6CL for <notmuch@notmuchmail.org>;
\r
16 Sun, 23 Jun 2013 16:43:29 -0700 (PDT)
\r
17 Received: from dmz-mailsec-scanner-2.mit.edu (dmz-mailsec-scanner-2.mit.edu
\r
19 by olra.theworths.org (Postfix) with ESMTP id DC8DF431FB6
\r
20 for <notmuch@notmuchmail.org>; Sun, 23 Jun 2013 16:43:28 -0700 (PDT)
\r
21 X-AuditID: 1209190d-b7f078e000000937-9c-51c78820db61
\r
22 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])
\r
23 by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP
\r
24 id 32.DD.02359.02887C15; Sun, 23 Jun 2013 19:43:28 -0400 (EDT)
\r
25 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])
\r
26 by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id r5NNhP6J025545;
\r
27 Sun, 23 Jun 2013 19:43:26 -0400
\r
28 Received: from drake.dyndns.org
\r
29 (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com
\r
30 [216.15.114.40]) (authenticated bits=0)
\r
31 (User authenticated as amdragon@ATHENA.MIT.EDU)
\r
32 by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id r5NNhNWN023368
\r
33 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
\r
34 Sun, 23 Jun 2013 19:43:25 -0400
\r
35 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)
\r
36 (envelope-from <amdragon@mit.edu>)
\r
37 id 1UqtwJ-0000L4-Ul; Sun, 23 Jun 2013 19:43:23 -0400
\r
38 From: Austin Clements <amdragon@MIT.EDU>
\r
39 To: notmuch@notmuchmail.org
\r
40 Subject: [PATCH 2/3] emacs: Use S-exp format everywhere
\r
41 Date: Sun, 23 Jun 2013 19:43:18 -0400
\r
42 Message-Id: <1372030999-1262-2-git-send-email-amdragon@mit.edu>
\r
43 X-Mailer: git-send-email 1.7.10.4
\r
44 In-Reply-To: <1372030999-1262-1-git-send-email-amdragon@mit.edu>
\r
45 References: <1372030999-1262-1-git-send-email-amdragon@mit.edu>
\r
46 X-Brightmail-Tracker:
\r
47 H4sIAAAAAAAAA+NgFtrEIsWRmVeSWpSXmKPExsUixCmqrKvQcTzQ4MhnaYvrN2cyOzB6PFt1
\r
48 izmAMYrLJiU1J7MstUjfLoErY/ehVpaC18IVf7ZOZW1gXCTQxcjJISFgIvH3xQtGCFtM4sK9
\r
49 9WxdjFwcQgL7GCUab6xkgXA2Mkp82/wWyrnDJLG+4RgjhDOXUeL9lmOsIP1sAhoS2/YvB5sl
\r
50 IiAtsfPubKA4BwezgJrEny4VkLCwgLlE9/oDzCA2i4CqxKm+NWDlvAL2ElvProE6Q1Gi+9kE
\r
51 NhCbU8BB4v+PiewgY4SAauauSJrAyL+AkWEVo2xKbpVubmJmTnFqsm5xcmJeXmqRrpFebmaJ
\r
52 XmpK6SZGcNBI8u5gfHdQ6RCjAAejEg/vD8vjgUKsiWXFlbmHGCU5mJREec+3AIX4kvJTKjMS
\r
53 izPii0pzUosPMUpwMCuJ8PZaAeV4UxIrq1KL8mFS0hwsSuK8ord2BgoJpCeWpGanphakFsFk
\r
54 ZTg4lCR4P7cBNQoWpaanVqRl5pQgpJk4OEGG8wANZ24HGV5ckJhbnJkOkT/FqCglzvsTpFkA
\r
55 JJFRmgfXC4vqV4ziQK8I814EqeIBJgS47ldAg5mABk9OBRtckoiQkmpgtGQMeSz7c5Z6zE3z
\r
56 M2yVfLPUCmbc6M956j+1jpF11vz4osKLEx8U8qr1B3zbtGCTUcnSsDf/jBSZN3Fxr58SrcVb
\r
57 4ln5weui1evcA057MmclOy/iEzzjXOzD6Lr2hVdMxLrc96ozc58vdHsxn/luxo25c3cfXsuy
\r
58 2iZEmjfptl2D6UuVJya/lFiKMxINtZiLihMBJIbCZsUCAAA=
\r
59 X-BeenThere: notmuch@notmuchmail.org
\r
60 X-Mailman-Version: 2.1.13
\r
62 List-Id: "Use and development of the notmuch mail system."
\r
63 <notmuch.notmuchmail.org>
\r
64 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
65 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
66 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
67 List-Post: <mailto:notmuch@notmuchmail.org>
\r
68 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
69 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
70 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
71 X-List-Received-Date: Sun, 23 Jun 2013 23:43:37 -0000
\r
73 This switches `notmuch-mua-reply' and `notmuch-query-get-threads' to
\r
74 the S-exp format. These were the last two uses of the JSON format in
\r
77 emacs/notmuch-mua.el | 4 ++--
\r
78 emacs/notmuch-query.el | 4 ++--
\r
79 test/emacs-show | 2 +-
\r
80 3 files changed, 5 insertions(+), 5 deletions(-)
\r
82 diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
\r
83 index 24eebff..329d342 100644
\r
84 --- a/emacs/notmuch-mua.el
\r
85 +++ b/emacs/notmuch-mua.el
\r
86 @@ -146,7 +146,7 @@ list."
\r
87 (unless (bolp) (insert "\n")))
\r
89 (defun notmuch-mua-reply (query-string &optional sender reply-all)
\r
90 - (let ((args '("reply" "--format=json" "--format-version=1"))
\r
91 + (let ((args '("reply" "--format=sexp" "--format-version=1"))
\r
94 (when notmuch-show-process-crypto
\r
95 @@ -158,7 +158,7 @@ list."
\r
96 (setq args (append args (list query-string)))
\r
98 ;; Get the reply object as JSON, and parse it into an elisp object.
\r
99 - (setq reply (apply #'notmuch-call-notmuch-json args))
\r
100 + (setq reply (apply #'notmuch-call-notmuch-sexp args))
\r
102 ;; Extract the original message to simplify the following code.
\r
103 (setq original (plist-get reply :original))
\r
104 diff --git a/emacs/notmuch-query.el b/emacs/notmuch-query.el
\r
105 index 6e9f406..51d427f 100644
\r
106 --- a/emacs/notmuch-query.el
\r
107 +++ b/emacs/notmuch-query.el
\r
108 @@ -29,11 +29,11 @@ A thread is a forest or list of trees. A tree is a two element
\r
109 list where the first element is a message, and the second element
\r
110 is a possibly empty forest of replies.
\r
112 - (let ((args '("show" "--format=json" "--format-version=1")))
\r
113 + (let ((args '("show" "--format=sexp" "--format-version=1")))
\r
114 (if notmuch-show-process-crypto
\r
115 (setq args (append args '("--decrypt"))))
\r
116 (setq args (append args search-terms))
\r
117 - (apply #'notmuch-call-notmuch-json args)))
\r
118 + (apply #'notmuch-call-notmuch-sexp args)))
\r
120 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
\r
121 ;; Mapping functions across collections of messages.
\r
122 diff --git a/test/emacs-show b/test/emacs-show
\r
123 index 9f2ccb0..ae70053 100755
\r
124 --- a/test/emacs-show
\r
125 +++ b/test/emacs-show
\r
126 @@ -189,7 +189,7 @@ This is an error (see *Notmuch errors* for more details)
\r
130 -command: $PWD/notmuch_fail show --format\\=json --format-version\\=1 --exclude\\=false \\' \\* \\'
\r
131 +command: $PWD/notmuch_fail show --format\\=sexp --format-version\\=1 --exclude\\=false \\' \\* \\'
\r