From: Mark Walters <markwalters1009@gmail.com>
Date: Sat, 1 Jun 2013 19:04:43 +0000 (+0100)
Subject: contrib: pick: use the sexp parser
X-Git-Tag: 0.16_rc1~85
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=5461c31d648f8ee6a8fb713c96ad10bc6d733c29;hp=b6a60cf355de9c54a71d8859d8b57aed1fb688d5

contrib: pick: use the sexp parser

This just converts notmuch-pick to use the sexp parser.
---

diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el
index 128fabf8..33905d61 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