[PATCH 06/11] emacs: Support passing input via `notmuch-call-notmuch-*'

diff --git a/66/ef471b58ab1f6b66c8a506c6a38d5ccfe93378 b/66/ef471b58ab1f6b66c8a506c6a38d5ccfe93378
new file mode 100644 (file)
index 0000000..6db4d92
--- /dev/null
+++ b/66/ef471b58ab1f6b66c8a506c6a38d5ccfe93378
@@ -0,0 +1,149 @@
+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 97DD2431FAE\r
+       for <notmuch@notmuchmail.org>; Mon,  7 Oct 2013 15:33:42 -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 7YlJxRDa1r1O for <notmuch@notmuchmail.org>;\r
+       Mon,  7 Oct 2013 15:33:37 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-5.mit.edu (dmz-mailsec-scanner-5.mit.edu\r
+       [18.7.68.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 46E55431FBD\r
+       for <notmuch@notmuchmail.org>; Mon,  7 Oct 2013 15:33:30 -0700 (PDT)\r
+X-AuditID: 12074422-b7f5a8e000000a34-81-525336b75904\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+       by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 9B.F6.02612.7B633525; Mon,  7 Oct 2013 18:33:28 -0400 (EDT)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+       by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id r97MXP5f024575; \r
+       Mon, 7 Oct 2013 18:33:26 -0400\r
+Received: from drake.dyndns.org (26-4-172.dynamic.csail.mit.edu [18.26.4.172])\r
+       (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 r97MXNXF028509\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Mon, 7 Oct 2013 18:33:25 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1VTJMh-0006bw-Lx; Mon, 07 Oct 2013 18:33:23 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 06/11] emacs: Support passing input via\r
+       `notmuch-call-notmuch-*'\r
+Date: Mon,  7 Oct 2013 18:33:16 -0400\r
+Message-Id: <1381185201-25197-7-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.8.4.rc3\r
+In-Reply-To: <1381185201-25197-1-git-send-email-amdragon@mit.edu>\r
+References: <1381185201-25197-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrIIsWRmVeSWpSXmKPExsUixCmqrbvDLDjI4IqVxfWbM5kdGD2erbrF\r
+       HMAYxWWTkpqTWZZapG+XwJVxbN1K1oIFEhVv+7ewNTDeFO5i5OSQEDCRuLrsLjOELSZx4d56\r
+       ti5GLg4hgX2MEqvf7odyNjBKPJ97iRXCOcwk8f30GiaQFiGBuYwSMxvAbDYBDYlt+5czgtgi\r
+       AtISO+/OBmrg4GAWUJP406UCEhYWCJA4Ofk0WDmLgKrEu2W/WEBsXgEHiec7H0JdoSSx8NQ2\r
+       VhCbU8BRYsnGi2wQqxwk5u5fxDqBkX8BI8MqRtmU3Crd3MTMnOLUZN3i5MS8vNQiXVO93MwS\r
+       vdSU0k2MoJBhd1HawfjzoNIhRgEORiUe3oyjQUFCrIllxZW5hxglOZiURHnPmAYHCfEl5adU\r
+       ZiQWZ8QXleakFh9ilOBgVhLhFTACyvGmJFZWpRblw6SkOViUxHlvcdgHCQmkJ5akZqemFqQW\r
+       wWRlODiUJHjDQIYKFqWmp1akZeaUIKSZODhBhvMADb8FUsNbXJCYW5yZDpE/xagoJc57ByQh\r
+       AJLIKM2D64XF9CtGcaBXhHk/g1TxANMBXPcroMFMQIN12QNBBpckIqSkGhjVZ3XJHDnznvfx\r
+       zj1vE/9M6jMMmB9u6fvp6spuzvYe/e2tyy5xffnJEdxtxPA86mzYH/14LxdNu4W74xyOPfp5\r
+       2GjRlbKc8MslArlsjhYBZ1XDJ/06MX2n7ryLG/8LX766xF5zlVxn6qqUa4w9yXVt1/evtEyR\r
+       iVm6TTv70sNmDpn5JmGbtt9RYinOSDTUYi4qTgQAAOVSrMQCAAA=\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: Mon, 07 Oct 2013 22:33:43 -0000\r
+\r
+This adds support for passing a string to write to notmuch's stdin to\r
+`notmuch-call-notmuch-process' and `notmuch-call-notmuch-sexp'.  Since\r
+this makes both interfaces a little more complicated, it also unifies\r
+their documentation better.\r
+---\r
+ emacs/notmuch-lib.el | 39 +++++++++++++++++++++++++++++++++------\r
+ 1 file changed, 33 insertions(+), 6 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+index 4e0604e..22156f1 100644\r
+--- a/emacs/notmuch-lib.el\r
++++ b/emacs/notmuch-lib.el\r
+@@ -534,28 +534,55 @@ You may need to restart Emacs or upgrade your notmuch package."))\r
+       ;; `notmuch-logged-error' does not return.\r
+       ))))\r
+ \r
++(defun notmuch-call-notmuch--helper (destination args)\r
++  "Helper for synchronous notmuch invocation commands.\r
++\r
++This wraps `call-process'.  DESTINATION has the same meaning as\r
++for `call-process'.  ARGS is as described for\r
++`notmuch-call-notmuch-process'."\r
++\r
++  (let (stdin-string)\r
++    (while (keywordp (car args))\r
++      (case (car args)\r
++      (:stdin-string (setq stdin-string (cadr args)\r
++                           args (cddr args)))\r
++      (otherwise\r
++       (error "Unknown keyword argument: %s" (car args)))))\r
++    (if (null stdin-string)\r
++      (apply #'call-process notmuch-command nil destination nil args)\r
++      (insert stdin-string)\r
++      (apply #'call-process-region (point-min) (point-max)\r
++           notmuch-command t destination nil args))))\r
++\r
+ (defun notmuch-call-notmuch-process (&rest args)\r
+-  "Synchronously invoke \"notmuch\" with the given list of arguments.\r
++  "Synchronously invoke `notmuch-command' with ARGS.\r
++\r
++The caller may provide keyword arguments before ARGS.  Currently\r
++supported keyword arguments are:\r
++\r
++  :stdin-string STRING - Write STRING to stdin\r
+ \r
+ If notmuch exits with a non-zero status, output from the process\r
+ will appear in a buffer named \"*Notmuch errors*\" and an error\r
+ will be signaled."\r
+   (with-temp-buffer\r
+-    (let ((status (apply #'call-process notmuch-command nil t nil args)))\r
++    (let ((status (notmuch-call-notmuch--helper t args)))\r
+       (notmuch-check-exit-status status (cons notmuch-command args)\r
+                                (buffer-string)))))\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
++This is equivalent to `notmuch-call-notmuch-process', but parses\r
++notmuch's output as an S-expression and returns the parsed value.\r
++Like `notmuch-call-notmuch-process', if notmuch exits with a\r
++non-zero status, this will report its output and signal an\r
++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
++        (let ((status (notmuch-call-notmuch--helper (list t err-file) args)))\r
+           (notmuch-check-exit-status status (cons notmuch-command args)\r
+                                      (buffer-string) err-file)\r
+           (goto-char (point-min))\r
+-- \r
+1.8.4.rc3\r
+\r