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 53EE1421178
\r
6 for <notmuch@notmuchmail.org>; Thu, 24 Oct 2013 08:19:54 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\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 3g2qnhGIjRWc for <notmuch@notmuchmail.org>;
\r
16 Thu, 24 Oct 2013 08:19:50 -0700 (PDT)
\r
17 Received: from dmz-mailsec-scanner-4.mit.edu (dmz-mailsec-scanner-4.mit.edu
\r
19 by olra.theworths.org (Postfix) with ESMTP id 37C91429E52
\r
20 for <notmuch@notmuchmail.org>; Thu, 24 Oct 2013 08:19:28 -0700 (PDT)
\r
21 X-AuditID: 1209190f-b7fa08e0000009c6-e0-52693a7f7da6
\r
22 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])
\r
23 by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP
\r
24 id EA.10.02502.F7A39625; Thu, 24 Oct 2013 11:19: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 r9OFJFie018646;
\r
27 Thu, 24 Oct 2013 11:19:15 -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 r9OFJCI1012915
\r
33 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
\r
34 Thu, 24 Oct 2013 11:19:14 -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 1VZMgq-0006ds-P9; Thu, 24 Oct 2013 11:19:12 -0400
\r
38 From: Austin Clements <amdragon@MIT.EDU>
\r
39 To: notmuch@notmuchmail.org
\r
40 Subject: [PATCH v2 05/11] emacs: Move `notmuch-call-notmuch-process' to
\r
42 Date: Thu, 24 Oct 2013 11:19:05 -0400
\r
43 Message-Id: <1382627951-25252-6-git-send-email-amdragon@mit.edu>
\r
44 X-Mailer: git-send-email 1.8.4.rc3
\r
45 In-Reply-To: <1382627951-25252-1-git-send-email-amdragon@mit.edu>
\r
46 References: <1382627951-25252-1-git-send-email-amdragon@mit.edu>
\r
47 X-Brightmail-Tracker:
\r
48 H4sIAAAAAAAAA+NgFjrCIsWRmVeSWpSXmKPExsUixG6nrltvlRlkcLzDyKJpurPF6rk8Ftdv
\r
49 zmR2YPbYOesuu8et+6/ZPZ6tusUcwBzFZZOSmpNZllqkb5fAlfF59iPmgslCFdN7epkbGFv5
\r
50 uxg5OSQETCTm3N3NAmGLSVy4t54NxBYS2McoMaejuIuRC8jeyCjx9dg1ZgjnDpPEn1m9rBDO
\r
51 XEaJPasXMYG0sAloSGzbv5wRxBYRkJbYeXc2K4jNLBAtceTyDLCxwgLBEitnvwaaxMHBIqAq
\r
52 cXBVJEiYV8BB4u6B74wQVyhJLDy1DayVU8BR4ufra4wQFzlI/Pp9hmUCI/8CRoZVjLIpuVW6
\r
53 uYmZOcWpybrFyYl5ealFuiZ6uZkleqkppZsYQYHFKcm/g/HbQaVDjAIcjEo8vBof0oOEWBPL
\r
54 iitzDzFKcjApifLeM80MEuJLyk+pzEgszogvKs1JLT7EKMHBrCTCO00PKMebklhZlVqUD5OS
\r
55 5mBREue9yWEfJCSQnliSmp2aWpBaBJOV4eBQkuD9ZwnUKFiUmp5akZaZU4KQZuLgBBnOAzRc
\r
56 xgpkeHFBYm5xZjpE/hSjopQ47yWQZgGQREZpHlwvLPJfMYoDvSLM+wGkigeYNOC6XwENZgIa
\r
57 PGVJGsjgkkSElFQDY/FjqbfzuB6by52bq+HEnVQikFCQxLn9Kp+1rnxpR9DZXbciIuNvZISe
\r
58 5txw9Zcg8+9UXy6Js89/cO+99WRv0rX1krvbatRuHby/aNL3Pz/mWMo4GshavthivIQ7KXjr
\r
59 jhs3eU+3iVrZGi9aPO1u59kPkea5DZ95dGuOm8q9nshcb7/vzNGgQCWW4oxEQy3mouJEABHU
\r
61 X-BeenThere: notmuch@notmuchmail.org
\r
62 X-Mailman-Version: 2.1.13
\r
64 List-Id: "Use and development of the notmuch mail system."
\r
65 <notmuch.notmuchmail.org>
\r
66 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
67 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
68 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
69 List-Post: <mailto:notmuch@notmuchmail.org>
\r
70 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
71 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
72 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
73 X-List-Received-Date: Thu, 24 Oct 2013 15:19:54 -0000
\r
75 Previously, this was in notmuch.el, but all of the other notmuch call
\r
76 wrappers were in notmuch-lib.el. Move `notmuch-call-notmuch-process'
\r
77 to live with its friends. This happens to fix a missing dependency
\r
78 from notmuch-tag.el, which required notmuch-lib, but not notmuch.
\r
80 emacs/notmuch-lib.el | 11 +++++++++++
\r
81 emacs/notmuch.el | 11 -----------
\r
82 2 files changed, 11 insertions(+), 11 deletions(-)
\r
84 diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
\r
85 index 58f3313..4e0604e 100644
\r
86 --- a/emacs/notmuch-lib.el
\r
87 +++ b/emacs/notmuch-lib.el
\r
88 @@ -534,6 +534,17 @@ You may need to restart Emacs or upgrade your notmuch package."))
\r
89 ;; `notmuch-logged-error' does not return.
\r
92 +(defun notmuch-call-notmuch-process (&rest args)
\r
93 + "Synchronously invoke \"notmuch\" with the given list of arguments.
\r
95 +If notmuch exits with a non-zero status, output from the process
\r
96 +will appear in a buffer named \"*Notmuch errors*\" and an error
\r
99 + (let ((status (apply #'call-process notmuch-command nil t nil args)))
\r
100 + (notmuch-check-exit-status status (cons notmuch-command args)
\r
101 + (buffer-string)))))
\r
103 (defun notmuch-call-notmuch-sexp (&rest args)
\r
104 "Invoke `notmuch-command' with ARGS and return the parsed S-exp output.
\r
106 diff --git a/emacs/notmuch.el b/emacs/notmuch.el
\r
107 index 53e9826..496c8ec 100644
\r
108 --- a/emacs/notmuch.el
\r
109 +++ b/emacs/notmuch.el
\r
110 @@ -535,17 +535,6 @@ If BARE is set then do not prefix with \"thread:\""
\r
111 (let ((message-id (notmuch-search-find-thread-id)))
\r
112 (notmuch-mua-new-reply message-id prompt-for-sender nil)))
\r
114 -(defun notmuch-call-notmuch-process (&rest args)
\r
115 - "Synchronously invoke \"notmuch\" with the given list of arguments.
\r
117 -If notmuch exits with a non-zero status, output from the process
\r
118 -will appear in a buffer named \"*Notmuch errors*\" and an error
\r
119 -will be signaled."
\r
120 - (with-temp-buffer
\r
121 - (let ((status (apply #'call-process notmuch-command nil t nil args)))
\r
122 - (notmuch-check-exit-status status (cons notmuch-command args)
\r
123 - (buffer-string)))))
\r
125 (defun notmuch-search-set-tags (tags &optional pos)
\r
126 (let ((new-result (plist-put (notmuch-search-get-result pos) :tags tags)))
\r
127 (notmuch-search-update-result new-result pos)))
\r