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 E8151431FAE
\r
6 for <notmuch@notmuchmail.org>; Mon, 7 Oct 2013 15:33:33 -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 v1DiBQpOOtGy for <notmuch@notmuchmail.org>;
\r
16 Mon, 7 Oct 2013 15:33:27 -0700 (PDT)
\r
17 Received: from dmz-mailsec-scanner-1.mit.edu (dmz-mailsec-scanner-1.mit.edu
\r
19 by olra.theworths.org (Postfix) with ESMTP id 8E667431FAF
\r
20 for <notmuch@notmuchmail.org>; Mon, 7 Oct 2013 15:33:27 -0700 (PDT)
\r
21 X-AuditID: 1209190c-b7fd38e0000009aa-d6-525336b6c2ae
\r
22 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])
\r
23 by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP
\r
24 id E3.41.02474.6B633525; Mon, 7 Oct 2013 18:33: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 r97MXPe8024733;
\r
27 Mon, 7 Oct 2013 18:33:26 -0400
\r
28 Received: from drake.dyndns.org (26-4-172.dynamic.csail.mit.edu [18.26.4.172])
\r
29 (authenticated bits=0)
\r
30 (User authenticated as amdragon@ATHENA.MIT.EDU)
\r
31 by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id r97MXNI2028507
\r
32 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
\r
33 Mon, 7 Oct 2013 18:33:25 -0400
\r
34 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)
\r
35 (envelope-from <amdragon@mit.edu>)
\r
36 id 1VTJMh-0006bp-LQ; Mon, 07 Oct 2013 18:33:23 -0400
\r
37 From: Austin Clements <amdragon@MIT.EDU>
\r
38 To: notmuch@notmuchmail.org
\r
39 Subject: [PATCH 05/11] emacs: Move `notmuch-call-notmuch-process' to
\r
41 Date: Mon, 7 Oct 2013 18:33:15 -0400
\r
42 Message-Id: <1381185201-25197-6-git-send-email-amdragon@mit.edu>
\r
43 X-Mailer: git-send-email 1.8.4.rc3
\r
44 In-Reply-To: <1381185201-25197-1-git-send-email-amdragon@mit.edu>
\r
45 References: <1381185201-25197-1-git-send-email-amdragon@mit.edu>
\r
46 X-Brightmail-Tracker:
\r
47 H4sIAAAAAAAAA+NgFtrEIsWRmVeSWpSXmKPExsUixG6nrrvdLDjI4NNpFovrN2cyOzB6PFt1
\r
48 izmAMYrLJiU1J7MstUjfLoEr41zzeaaCyUIVP1vfsDcwtvJ3MXJySAiYSFxee48VwhaTuHBv
\r
49 PRuILSSwj1Fiw5zMLkYuIHsDo8SECXtZIJzDTBLbp9xhhXDmMkqs2/iSBaSFTUBDYtv+5Ywg
\r
50 toiAtMTOu7OBijg4mAXUJP50qYCEhQUCJCZ8X8oOYrMIqEosmv8HzOYVcJC40tsAdYWSxMJT
\r
51 28BsTgFHiSUbL0Jd5CAxd/8i1gmM/AsYGVYxyqbkVunmJmbmFKcm6xYnJ+blpRbpGurlZpbo
\r
52 paaUbmIEBQ2nJM8OxjcHlQ4xCnAwKvHwChwOChJiTSwrrsw9xCjJwaQkynvGNDhIiC8pP6Uy
\r
53 I7E4I76oNCe1+BCjBAezkgivgBFQjjclsbIqtSgfJiXNwaIkznuTwz5ISCA9sSQ1OzW1ILUI
\r
54 JivDwaEkwRsGMlSwKDU9tSItM6cEIc3EwQkynAdo+AKQGt7igsTc4sx0iPwpRkUpcd7ZIAkB
\r
55 kERGaR5cLyyqXzGKA70izLsVpIoHmBDgul8BDWYCGqzLHggyuCQRISXVwJgroVm5x+7EHrPX
\r
56 d83Fl/32nW+Zc1vlhd7za8w31G/ONovo2yoYHsXa+vnJh7PrUvtF66/MWPf5/uXrkxqqy/lN
\r
57 Lmdx77N6wxyy4//+1O1fD0yLTXY+9kT2xNfJDoatcwz2Xt+ZOL/5qV+KVUb4k591cQ8Y56rq
\r
58 6e5qv1ac5n2xZI+5aZWBxUklluKMREMt5qLiRADJr4NPxQIAAA==
\r
59 X-BeenThere: notmuch@notmuchmail.org
\r
60 X-Mailman-Version: 2.1.13
\r
62 List-Id: "Use and development of the notmuch mail system."
\r
63 <notmuch.notmuchmail.org>
\r
64 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
65 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
66 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
67 List-Post: <mailto:notmuch@notmuchmail.org>
\r
68 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
69 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
70 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
71 X-List-Received-Date: Mon, 07 Oct 2013 22:33:34 -0000
\r
73 Previously, this was in notmuch.el, but all of the other notmuch call
\r
74 wrappers were in notmuch-lib.el. Move `notmuch-call-notmuch-process'
\r
75 to live with its friends. This happens to fix a missing dependency
\r
76 from notmuch-tag.el, which required notmuch-lib, but not notmuch.
\r
78 emacs/notmuch-lib.el | 11 +++++++++++
\r
79 emacs/notmuch.el | 11 -----------
\r
80 2 files changed, 11 insertions(+), 11 deletions(-)
\r
82 diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
\r
83 index 58f3313..4e0604e 100644
\r
84 --- a/emacs/notmuch-lib.el
\r
85 +++ b/emacs/notmuch-lib.el
\r
86 @@ -534,6 +534,17 @@ You may need to restart Emacs or upgrade your notmuch package."))
\r
87 ;; `notmuch-logged-error' does not return.
\r
90 +(defun notmuch-call-notmuch-process (&rest args)
\r
91 + "Synchronously invoke \"notmuch\" with the given list of arguments.
\r
93 +If notmuch exits with a non-zero status, output from the process
\r
94 +will appear in a buffer named \"*Notmuch errors*\" and an error
\r
97 + (let ((status (apply #'call-process notmuch-command nil t nil args)))
\r
98 + (notmuch-check-exit-status status (cons notmuch-command args)
\r
99 + (buffer-string)))))
\r
101 (defun notmuch-call-notmuch-sexp (&rest args)
\r
102 "Invoke `notmuch-command' with ARGS and return the parsed S-exp output.
\r
104 diff --git a/emacs/notmuch.el b/emacs/notmuch.el
\r
105 index 0ff248b..2c7678d 100644
\r
106 --- a/emacs/notmuch.el
\r
107 +++ b/emacs/notmuch.el
\r
108 @@ -511,17 +511,6 @@ If BARE is set then do not prefix with \"thread:\""
\r
109 (let ((message-id (notmuch-search-find-thread-id)))
\r
110 (notmuch-mua-new-reply message-id prompt-for-sender nil)))
\r
112 -(defun notmuch-call-notmuch-process (&rest args)
\r
113 - "Synchronously invoke \"notmuch\" with the given list of arguments.
\r
115 -If notmuch exits with a non-zero status, output from the process
\r
116 -will appear in a buffer named \"*Notmuch errors*\" and an error
\r
117 -will be signaled."
\r
118 - (with-temp-buffer
\r
119 - (let ((status (apply #'call-process notmuch-command nil t nil args)))
\r
120 - (notmuch-check-exit-status status (cons notmuch-command args)
\r
121 - (buffer-string)))))
\r
123 (defun notmuch-search-set-tags (tags &optional pos)
\r
124 (let ((new-result (plist-put (notmuch-search-get-result pos) :tags tags)))
\r
125 (notmuch-search-update-result new-result pos)))
\r