[PATCH] contrib: pick: use the sexp parser

diff --git a/e5/5f89627f4160b91d0475aa9eca326d43511f5e b/e5/5f89627f4160b91d0475aa9eca326d43511f5e
new file mode 100644 (file)
index 0000000..65bbe78
--- /dev/null
+++ b/e5/5f89627f4160b91d0475aa9eca326d43511f5e
@@ -0,0 +1,93 @@
+Return-Path: <markwalters1009@gmail.com>\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 B1FF4429E59\r
+       for <notmuch@notmuchmail.org>; Sat,  1 Jun 2013 12:04:59 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+       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 VuuzOCOk+VEm for <notmuch@notmuchmail.org>;\r
+       Sat,  1 Jun 2013 12:04:52 -0700 (PDT)\r
+Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com\r
+       [209.85.212.173]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 06210431FDE\r
+       for <notmuch@notmuchmail.org>; Sat,  1 Jun 2013 12:04:51 -0700 (PDT)\r
+Received: by mail-wi0-f173.google.com with SMTP id hi5so1586525wib.0\r
+       for <notmuch@notmuchmail.org>; Sat, 01 Jun 2013 12:04:50 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer;\r
+       bh=bppmNxoZW/wSgd5qJHarE2n2KMYJu9jibWCoNg4sjGU=;\r
+       b=tYU7qorLuzgPax+sZwui2nCqd/J3LXIJy4MDKCv55GkbzL5Z9s5YTs0iLiGk9WEuIU\r
+       Fn4NWTQPn+CpQbkaXCOoVE6xFVifjjM5WOetxEPtTRHX/zXDObFHxAzyF6ALhkIQDz2p\r
+       GuUyX0BC5S4P8RWMwbrih9QrNWN80fT4AgAt8jEmhfx3SuC8FdnA53F79TiE78cTUpe6\r
+       RIyfzG2CqyfVrB8MfEyleX/1YLVSReJ8LUEaSXrmHUAQ3Eko1VO/rO+CGcXlc+s9hzjE\r
+       6nQ37kLceO08/cjKVlWhvhiwuQ5TFrTmPxJvnwVDnZKrMcKimkhwqTgSPoMbICaB8uGU\r
+       OGug==\r
+X-Received: by 10.180.126.97 with SMTP id mx1mr7507496wib.57.1370113489531;\r
+       Sat, 01 Jun 2013 12:04:49 -0700 (PDT)\r
+Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
+       by mx.google.com with ESMTPSA id en3sm12131159wid.1.2013.06.01.12.04.48\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sat, 01 Jun 2013 12:04:49 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] contrib: pick: use the sexp parser\r
+Date: Sat,  1 Jun 2013 20:04:43 +0100\r
+Message-Id: <1370113483-10081-1-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\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: Sat, 01 Jun 2013 19:04:59 -0000\r
+\r
+This just converts notmuch-pick to use the sexp parser.\r
+---\r
+\r
+ contrib/notmuch-pick/notmuch-pick.el |    5 ++---\r
+ 1 files changed, 2 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el\r
+index 128fabf..33905d6 100644\r
+--- a/contrib/notmuch-pick/notmuch-pick.el\r
++++ b/contrib/notmuch-pick/notmuch-pick.el\r
+@@ -773,8 +773,7 @@ Complete list of currently available key bindings:\r
+         (save-excursion\r
+           (goto-char (point-max))\r
+           (insert string))\r
+-      (notmuch-json-parse-partial-list 'notmuch-pick-insert-forest-thread\r
+-                                       'notmuch-pick-show-error\r
++      (notmuch-sexp-parse-partial-list 'notmuch-pick-insert-forest-thread\r
+                                        results-buf)))))\r
+ \r
+ (defun notmuch-pick-worker (basic-query &optional query-context target buffer)\r
+@@ -796,7 +795,7 @@ Complete list of currently available key bindings:\r
+     (if notmuch-pick-asynchronous-parser\r
+       (let ((proc (start-process\r
+                    "notmuch-pick" buffer\r
+-                   notmuch-command "show" "--body=false" "--format=json"\r
++                   notmuch-command "show" "--body=false" "--format=sexp"\r
+                    message-arg search-args))\r
+             ;; Use a scratch buffer to accumulate partial output.\r
+               ;; This buffer will be killed by the sentinel, which\r
+-- \r
+1.7.9.1\r
+\r