54/c4eb75773b2bcfcd8013ae6acb9d68a2786f52

   1 Return-Path: <amdragon@mit.edu>\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 0FCC2431FBD\r
   6         for <notmuch@notmuchmail.org>; Sun, 23 Jun 2013 16:43:36 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id fJX5Tr3ysuqp for <notmuch@notmuchmail.org>;\r
  16         Sun, 23 Jun 2013 16:43:28 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-7.mit.edu (dmz-mailsec-scanner-7.mit.edu\r
  18         [18.7.68.36])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 0760A431FAF\r
  20         for <notmuch@notmuchmail.org>; Sun, 23 Jun 2013 16:43:27 -0700 (PDT)\r
  21 X-AuditID: 12074424-b7f228e00000096b-be-51c7881f64e1\r
  22 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
  23         by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 6D.0C.02411.F1887C15; Sun, 23 Jun 2013 19:43:27 -0400 (EDT)\r
  25 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
  26         by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id r5NNhPne024474; \r
  27         Sun, 23 Jun 2013 19:43:26 -0400\r
  28 Received: from drake.dyndns.org\r
  29         (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  30         [216.15.114.40]) (authenticated bits=0)\r
  31         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  32         by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id r5NNhNmA023367\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Sun, 23 Jun 2013 19:43:25 -0400\r
  35 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
  36         (envelope-from <amdragon@mit.edu>)\r
  37         id 1UqtwJ-0000L2-Td; Sun, 23 Jun 2013 19:43:23 -0400\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH 1/3] emacs: Introduce `notmuch-call-notmuch-sexp'\r
  41 Date: Sun, 23 Jun 2013 19:43:17 -0400\r
  42 Message-Id: <1372030999-1262-1-git-send-email-amdragon@mit.edu>\r
  43 X-Mailer: git-send-email 1.7.10.4\r
  44 X-Brightmail-Tracker:\r
  45  H4sIAAAAAAAAA+NgFprFIsWRmVeSWpSXmKPExsUixG6nrivfcTzQ4PsrVYvrN2cyOzB6PFt1\r
  46         izmAMYrLJiU1J7MstUjfLoEr49euA2wFZ7kq/nZeYm5gPMjRxcjJISFgIjH58kVGCFtM4sK9\r
  47         9WxdjFwcQgL7GCX+nvvPAuFsZJRYOWEyI4Rzh0li38ZeqMxcRokpX38xgfSzCWhIbNu/HGyW\r
  48         iIC0xM67s1m7GDk4mAXUJP50qYCEhQUcJc4fXQsWZhFQlXi+NAUkzCtgL3H8zCw2iCsUJbqf\r
  49         TWCbwMi7gJFhFaNsSm6Vbm5iZk5xarJucXJiXl5qka65Xm5miV5qSukmRnAQuKjsYGw+pHSI\r
  50         UYCDUYmH94fl8UAh1sSy4srcQ4ySHExKorznW4BCfEn5KZUZicUZ8UWlOanFhxglOJiVRHh7\r
  51         rYByvCmJlVWpRfkwKWkOFiVxXrFbOwOFBNITS1KzU1MLUotgsjIcHEoSvNvagBoFi1LTUyvS\r
  52         MnNKENJMHJwgw3mAhh8DqeEtLkjMLc5Mh8ifYlSUEufdA5IQAElklObB9cKi9BWjONArwrwX\r
  53         Qap4gBEO1/0KaDAT0ODJqWCDSxIRUlINjO2Xa47Z/Sr8XxK8Uu1jecqhfP+1s/bvEPx9baKT\r
  54         0JT3L8MnWTI+5fsadXTRNOZSUd7EpjVTgwyuSsbPTNWaq9k1Nc5sUuq2ywHbPke7WXubTnTf\r
  55         tHdRp+GGyjIDU47yM13W03oW/2RaNcFPMW55TtPOPOXJTSylep0nneeHTLlpz+ftWHWjTYml\r
  56         OCPRUIu5qDgRAG0c9xitAgAA\r
  57 X-BeenThere: notmuch@notmuchmail.org\r
  58 X-Mailman-Version: 2.1.13\r
  59 Precedence: list\r
  60 List-Id: "Use and development of the notmuch mail system."\r
  61         <notmuch.notmuchmail.org>\r
  62 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  63         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  64 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  65 List-Post: <mailto:notmuch@notmuchmail.org>\r
  66 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  67 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  68         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  69 X-List-Received-Date: Sun, 23 Jun 2013 23:43:36 -0000\r
  70 \r
  71 This is just like `notmuch-call-notmuch-json', but parses S-expression\r
  72 output.  Note that, also like `notmuch-call-notmuch-json', this\r
  73 doesn't consider trailing data to be an error, which may or may not be\r
  74 what we want in the long run.\r
  75 ---\r
  76  emacs/notmuch-lib.el |   17 +++++++++++++++++\r
  77  1 file changed, 17 insertions(+)\r
  78 \r
  79 diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
  80 index 534f217..36eacc1 100644\r
  81 --- a/emacs/notmuch-lib.el\r
  82 +++ b/emacs/notmuch-lib.el\r
  83 @@ -484,6 +484,23 @@ an error."\r
  84               (json-read)))\r
  85         (delete-file err-file)))))\r
  86  \r
  87 +(defun notmuch-call-notmuch-sexp (&rest args)\r
  88 +  "Invoke `notmuch-command' with ARGS and return the parsed S-exp output.\r
  89 +\r
  90 +If notmuch exits with a non-zero status, this will pop up a\r
  91 +buffer containing notmuch's output and signal an error."\r
  92 +\r
  93 +  (with-temp-buffer\r
  94 +    (let ((err-file (make-temp-file "nmerr")))\r
  95 +      (unwind-protect\r
  96 +         (let ((status (apply #'call-process\r
  97 +                              notmuch-command nil (list t err-file) nil args)))\r
  98 +           (notmuch-check-exit-status status (cons notmuch-command args)\r
  99 +                                      (buffer-string) err-file)\r
 100 +           (goto-char (point-min))\r
 101 +           (read (current-buffer)))\r
 102 +       (delete-file err-file)))))\r
 103 +\r
 104  (defun notmuch-start-notmuch (name buffer sentinel &rest args)\r
 105    "Start and return an asynchronous notmuch command.\r
 106  \r
 107 -- \r
 108 1.7.10.4\r
 109 \r