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