[PATCH 1/3] emacs: Introduce `notmuch-call-notmuch-sexp'

diff --git a/54/c4eb75773b2bcfcd8013ae6acb9d68a2786f52 b/54/c4eb75773b2bcfcd8013ae6acb9d68a2786f52
new file mode 100644 (file)
index 0000000..f698d99
--- /dev/null
+++ b/54/c4eb75773b2bcfcd8013ae6acb9d68a2786f52
@@ -0,0 +1,109 @@
+Return-Path: <amdragon@mit.edu>\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 0FCC2431FBD\r
+       for <notmuch@notmuchmail.org>; Sun, 23 Jun 2013 16:43:36 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[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 fJX5Tr3ysuqp for <notmuch@notmuchmail.org>;\r
+       Sun, 23 Jun 2013 16:43:28 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-7.mit.edu (dmz-mailsec-scanner-7.mit.edu\r
+       [18.7.68.36])\r
+       by olra.theworths.org (Postfix) with ESMTP id 0760A431FAF\r
+       for <notmuch@notmuchmail.org>; Sun, 23 Jun 2013 16:43:27 -0700 (PDT)\r
+X-AuditID: 12074424-b7f228e00000096b-be-51c7881f64e1\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+       by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 6D.0C.02411.F1887C15; Sun, 23 Jun 2013 19:43:27 -0400 (EDT)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+       by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id r5NNhPne024474; \r
+       Sun, 23 Jun 2013 19:43:26 -0400\r
+Received: from drake.dyndns.org\r
+       (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [216.15.114.40]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id r5NNhNmA023367\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sun, 23 Jun 2013 19:43:25 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1UqtwJ-0000L2-Td; Sun, 23 Jun 2013 19:43:23 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/3] emacs: Introduce `notmuch-call-notmuch-sexp'\r
+Date: Sun, 23 Jun 2013 19:43:17 -0400\r
+Message-Id: <1372030999-1262-1-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10.4\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFprFIsWRmVeSWpSXmKPExsUixG6nrivfcTzQ4PsrVYvrN2cyOzB6PFt1\r
+       izmAMYrLJiU1J7MstUjfLoEr49euA2wFZ7kq/nZeYm5gPMjRxcjJISFgIjH58kVGCFtM4sK9\r
+       9WxdjFwcQgL7GCX+nvvPAuFsZJRYOWEyI4Rzh0li38ZeqMxcRokpX38xgfSzCWhIbNu/HGyW\r
+       iIC0xM67s1m7GDk4mAXUJP50qYCEhQUcJc4fXQsWZhFQlXi+NAUkzCtgL3H8zCw2iCsUJbqf\r
+       TWCbwMi7gJFhFaNsSm6Vbm5iZk5xarJucXJiXl5qka65Xm5miV5qSukmRnAQuKjsYGw+pHSI\r
+       UYCDUYmH94fl8UAh1sSy4srcQ4ySHExKorznW4BCfEn5KZUZicUZ8UWlOanFhxglOJiVRHh7\r
+       rYByvCmJlVWpRfkwKWkOFiVxXrFbOwOFBNITS1KzU1MLUotgsjIcHEoSvNvagBoFi1LTUyvS\r
+       MnNKENJMHJwgw3mAhh8DqeEtLkjMLc5Mh8ifYlSUEufdA5IQAElklObB9cKi9BWjONArwrwX\r
+       Qap4gBEO1/0KaDAT0ODJqWCDSxIRUlINjO2Xa47Z/Sr8XxK8Uu1jecqhfP+1s/bvEPx9baKT\r
+       0JT3L8MnWTI+5fsadXTRNOZSUd7EpjVTgwyuSsbPTNWaq9k1Nc5sUuq2ywHbPke7WXubTnTf\r
+       tHdRp+GGyjIDU47yM13W03oW/2RaNcFPMW55TtPOPOXJTSylep0nneeHTLlpz+ftWHWjTYml\r
+       OCPRUIu5qDgRAG0c9xitAgAA\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: Sun, 23 Jun 2013 23:43:36 -0000\r
+\r
+This is just like `notmuch-call-notmuch-json', but parses S-expression\r
+output.  Note that, also like `notmuch-call-notmuch-json', this\r
+doesn't consider trailing data to be an error, which may or may not be\r
+what we want in the long run.\r
+---\r
+ emacs/notmuch-lib.el |   17 +++++++++++++++++\r
+ 1 file changed, 17 insertions(+)\r
+\r
+diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+index 534f217..36eacc1 100644\r
+--- a/emacs/notmuch-lib.el\r
++++ b/emacs/notmuch-lib.el\r
+@@ -484,6 +484,23 @@ an error."\r
+             (json-read)))\r
+       (delete-file err-file)))))\r
+ \r
++(defun notmuch-call-notmuch-sexp (&rest args)\r
++  "Invoke `notmuch-command' with ARGS and return the parsed S-exp output.\r
++\r
++If notmuch exits with a non-zero status, this will pop up a\r
++buffer containing notmuch's output and signal an error."\r
++\r
++  (with-temp-buffer\r
++    (let ((err-file (make-temp-file "nmerr")))\r
++      (unwind-protect\r
++        (let ((status (apply #'call-process\r
++                             notmuch-command nil (list t err-file) nil args)))\r
++          (notmuch-check-exit-status status (cons notmuch-command args)\r
++                                     (buffer-string) err-file)\r
++          (goto-char (point-min))\r
++          (read (current-buffer)))\r
++      (delete-file err-file)))))\r
++\r
+ (defun notmuch-start-notmuch (name buffer sentinel &rest args)\r
+   "Start and return an asynchronous notmuch command.\r
+ \r
+-- \r
+1.7.10.4\r
+\r