1 Return-Path: <markwalters1009@gmail.com>
\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 B1FF4429E59
\r
6 for <notmuch@notmuchmail.org>; Sat, 1 Jun 2013 12:04:59 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0.201 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,
\r
14 RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
15 Received: from olra.theworths.org ([127.0.0.1])
\r
16 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
17 with ESMTP id VuuzOCOk+VEm for <notmuch@notmuchmail.org>;
\r
18 Sat, 1 Jun 2013 12:04:52 -0700 (PDT)
\r
19 Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com
\r
20 [209.85.212.173]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
21 (No client certificate requested)
\r
22 by olra.theworths.org (Postfix) with ESMTPS id 06210431FDE
\r
23 for <notmuch@notmuchmail.org>; Sat, 1 Jun 2013 12:04:51 -0700 (PDT)
\r
24 Received: by mail-wi0-f173.google.com with SMTP id hi5so1586525wib.0
\r
25 for <notmuch@notmuchmail.org>; Sat, 01 Jun 2013 12:04:50 -0700 (PDT)
\r
26 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
\r
27 h=from:to:cc:subject:date:message-id:x-mailer;
\r
28 bh=bppmNxoZW/wSgd5qJHarE2n2KMYJu9jibWCoNg4sjGU=;
\r
29 b=tYU7qorLuzgPax+sZwui2nCqd/J3LXIJy4MDKCv55GkbzL5Z9s5YTs0iLiGk9WEuIU
\r
30 Fn4NWTQPn+CpQbkaXCOoVE6xFVifjjM5WOetxEPtTRHX/zXDObFHxAzyF6ALhkIQDz2p
\r
31 GuUyX0BC5S4P8RWMwbrih9QrNWN80fT4AgAt8jEmhfx3SuC8FdnA53F79TiE78cTUpe6
\r
32 RIyfzG2CqyfVrB8MfEyleX/1YLVSReJ8LUEaSXrmHUAQ3Eko1VO/rO+CGcXlc+s9hzjE
\r
33 6nQ37kLceO08/cjKVlWhvhiwuQ5TFrTmPxJvnwVDnZKrMcKimkhwqTgSPoMbICaB8uGU
\r
35 X-Received: by 10.180.126.97 with SMTP id mx1mr7507496wib.57.1370113489531;
\r
36 Sat, 01 Jun 2013 12:04:49 -0700 (PDT)
\r
37 Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])
\r
38 by mx.google.com with ESMTPSA id en3sm12131159wid.1.2013.06.01.12.04.48
\r
39 for <multiple recipients>
\r
40 (version=TLSv1.2 cipher=RC4-SHA bits=128/128);
\r
41 Sat, 01 Jun 2013 12:04:49 -0700 (PDT)
\r
42 From: Mark Walters <markwalters1009@gmail.com>
\r
43 To: notmuch@notmuchmail.org
\r
44 Subject: [PATCH] contrib: pick: use the sexp parser
\r
45 Date: Sat, 1 Jun 2013 20:04:43 +0100
\r
46 Message-Id: <1370113483-10081-1-git-send-email-markwalters1009@gmail.com>
\r
47 X-Mailer: git-send-email 1.7.9.1
\r
48 X-BeenThere: notmuch@notmuchmail.org
\r
49 X-Mailman-Version: 2.1.13
\r
51 List-Id: "Use and development of the notmuch mail system."
\r
52 <notmuch.notmuchmail.org>
\r
53 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
54 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
55 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
56 List-Post: <mailto:notmuch@notmuchmail.org>
\r
57 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
58 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
59 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
60 X-List-Received-Date: Sat, 01 Jun 2013 19:04:59 -0000
\r
62 This just converts notmuch-pick to use the sexp parser.
\r
65 contrib/notmuch-pick/notmuch-pick.el | 5 ++---
\r
66 1 files changed, 2 insertions(+), 3 deletions(-)
\r
68 diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el
\r
69 index 128fabf..33905d6 100644
\r
70 --- a/contrib/notmuch-pick/notmuch-pick.el
\r
71 +++ b/contrib/notmuch-pick/notmuch-pick.el
\r
72 @@ -773,8 +773,7 @@ Complete list of currently available key bindings:
\r
74 (goto-char (point-max))
\r
76 - (notmuch-json-parse-partial-list 'notmuch-pick-insert-forest-thread
\r
77 - 'notmuch-pick-show-error
\r
78 + (notmuch-sexp-parse-partial-list 'notmuch-pick-insert-forest-thread
\r
81 (defun notmuch-pick-worker (basic-query &optional query-context target buffer)
\r
82 @@ -796,7 +795,7 @@ Complete list of currently available key bindings:
\r
83 (if notmuch-pick-asynchronous-parser
\r
84 (let ((proc (start-process
\r
85 "notmuch-pick" buffer
\r
86 - notmuch-command "show" "--body=false" "--format=json"
\r
87 + notmuch-command "show" "--body=false" "--format=sexp"
\r
88 message-arg search-args))
\r
89 ;; Use a scratch buffer to accumulate partial output.
\r
90 ;; This buffer will be killed by the sentinel, which
\r