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