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 B5F3C429E2F
\r
6 for <notmuch@notmuchmail.org>; Tue, 22 Oct 2013 12:51:42 -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 ZprCSvwsIaYP for <notmuch@notmuchmail.org>;
\r
16 Tue, 22 Oct 2013 12:51:37 -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 7264F429E30
\r
20 for <notmuch@notmuchmail.org>; Tue, 22 Oct 2013 12:51:15 -0700 (PDT)
\r
21 X-AuditID: 1209190f-b7fa08e0000009c6-28-5266d732aae7
\r
22 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])
\r
23 by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP
\r
24 id C3.16.02502.237D6625; Tue, 22 Oct 2013 15:51:15 -0400 (EDT)
\r
25 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])
\r
26 by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id r9MJp3lR015066;
\r
27 Tue, 22 Oct 2013 15:51:04 -0400
\r
28 Received: from drake.dyndns.org (31-33-57.wireless.csail.mit.edu
\r
29 [128.31.33.57]) (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 r9MJp11l005202
\r
32 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
\r
33 Tue, 22 Oct 2013 15:51:03 -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 1VYhyn-0006ys-5X; Tue, 22 Oct 2013 15:51:01 -0400
\r
37 From: Austin Clements <amdragon@MIT.EDU>
\r
38 To: notmuch@notmuchmail.org
\r
39 Subject: [PATCH 7/8] pick: Use interactive specifications for tag changes
\r
40 Date: Tue, 22 Oct 2013 15:50:56 -0400
\r
41 Message-Id: <1382471457-26056-8-git-send-email-amdragon@mit.edu>
\r
42 X-Mailer: git-send-email 1.8.4.rc3
\r
43 In-Reply-To: <1382471457-26056-1-git-send-email-amdragon@mit.edu>
\r
44 References: <1382471457-26056-1-git-send-email-amdragon@mit.edu>
\r
45 X-Brightmail-Tracker:
\r
46 H4sIAAAAAAAAA+NgFtrEIsWRmVeSWpSXmKPExsUixCmqrGt8PS3I4NkNRovrN2cyOzB6PFt1
\r
47 izmAMYrLJiU1J7MstUjfLoErY2PHAuaCS1IVX1buYm1gfCTWxcjJISFgIvH72Gk2CFtM4sK9
\r
48 9UA2F4eQwD5GiXdfTjFDOBsZJX70vIJyjjFJXH3WAeXMZZSY8ukhM0g/m4CGxLb9yxlBbBEB
\r
49 aYmdd2ezdjFycDALqEn86VIBCQsLeEq0/T7GAmKzCKhKHO48DFbOK+Ag8X3fUmaIM5QkFp7a
\r
50 xgpicwo4Skzf948NZIwQUM2pOxwTGPkXMDKsYpRNya3SzU3MzClOTdYtTk7My0st0jXRy80s
\r
51 0UtNKd3ECA4aSf4djN8OKh1iFOBgVOLhfdCSFiTEmlhWXJl7iFGSg0lJlDfiKlCILyk/pTIj
\r
52 sTgjvqg0J7X4EKMEB7OSCG+zL1CONyWxsiq1KB8mJc3BoiTOe5PDPkhIID2xJDU7NbUgtQgm
\r
53 K8PBoSTBG3gNqFGwKDU9tSItM6cEIc3EwQkynAdo+DGQxbzFBYm5xZnpEPlTjIpS4rwRIM0C
\r
54 IImM0jy4XlhUv2IUB3pFmLcKpIoHmBDgul8BDWYCGjxlCdjgkkSElFQDY6fS1l97zhSLH6ma
\r
55 ++J67b1rMV+7WNSmcDbafTt2WXu+xLSDvQkfrb0YUm/cPtuqNeGyuMpPv4cbE5LVRHmOpWuu
\r
56 UokIZC1+mzX15cvQGTecVrvoH1zadbc8yTYqSLFY2MN2eeVFT7V9fWm/377hWWRq9riJUc/g
\r
57 3ppvl4MYcnp613h761emKbEUZyQaajEXFScCAKNpzxXFAgAA
\r
58 X-BeenThere: notmuch@notmuchmail.org
\r
59 X-Mailman-Version: 2.1.13
\r
61 List-Id: "Use and development of the notmuch mail system."
\r
62 <notmuch.notmuchmail.org>
\r
63 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
64 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
65 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
66 List-Post: <mailto:notmuch@notmuchmail.org>
\r
67 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
68 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
69 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
70 X-List-Received-Date: Tue, 22 Oct 2013 19:51:43 -0000
\r
73 contrib/notmuch-pick/notmuch-pick.el | 36 +++++++++++++++++++++---------------
\r
74 1 file changed, 21 insertions(+), 15 deletions(-)
\r
76 diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el
\r
77 index 8f504ed..13682ea 100644
\r
78 --- a/contrib/notmuch-pick/notmuch-pick.el
\r
79 +++ b/contrib/notmuch-pick/notmuch-pick.el
\r
81 (declare-function notmuch-show-strip-re "notmuch-show" (subject))
\r
82 (declare-function notmuch-show-spaces-n "notmuch-show" (n))
\r
83 (declare-function notmuch-read-query "notmuch" (prompt))
\r
84 -(declare-function notmuch-read-tag-changes "notmuch" (&optional initial-input &rest search-terms))
\r
85 +(declare-function notmuch-read-tag-changes "notmuch" (current-tags &optional prompt initial-input))
\r
86 (declare-function notmuch-update-tags "notmuch" (current-tags tag-changes))
\r
87 (declare-function notmuch-hello-trim "notmuch-hello" (search))
\r
88 (declare-function notmuch-search-find-thread-id "notmuch" ())
\r
89 @@ -372,21 +372,24 @@ Does NOT change the database."
\r
90 (notmuch-pick-set-tags new-tags)
\r
91 (notmuch-pick-refresh-result))))
\r
93 -(defun notmuch-pick-tag (&optional tag-changes)
\r
94 +(defun notmuch-pick-tag (tag-changes)
\r
95 "Change tags for the current message"
\r
97 - (setq tag-changes (notmuch-tag (notmuch-pick-get-message-id) tag-changes))
\r
99 + (list (notmuch-read-tag-changes (notmuch-pick-get-tags) "Tag message")))
\r
100 + (notmuch-tag (notmuch-pick-get-message-id) tag-changes)
\r
101 (notmuch-pick-tag-update-display tag-changes))
\r
103 -(defun notmuch-pick-add-tag ()
\r
104 +(defun notmuch-pick-add-tag (tag-changes)
\r
105 "Same as `notmuch-pick-tag' but sets initial input to '+'."
\r
107 - (notmuch-pick-tag "+"))
\r
109 + (list (notmuch-read-tag-changes (notmuch-pick-get-tags) "Tag message" "+")))
\r
110 + (notmuch-pick-tag tag-changes))
\r
112 -(defun notmuch-pick-remove-tag ()
\r
113 +(defun notmuch-pick-remove-tag (tag-changes)
\r
114 "Same as `notmuch-pick-tag' but sets initial input to '-'."
\r
116 - (notmuch-pick-tag "-"))
\r
118 + (list (notmuch-read-tag-changes (notmuch-pick-get-tags) "Tag message" "-")))
\r
119 + (notmuch-pick-tag tag-changes))
\r
121 ;; The next two functions close the message window before searching or
\r
122 ;; picking but they do so after the user has entered the query (in
\r
123 @@ -626,13 +629,16 @@ message will be \"unarchived\", i.e. the tag changes in
\r
124 (notmuch-pick-thread-mapcar 'notmuch-pick-get-message-id)
\r
127 -(defun notmuch-pick-tag-thread (&optional tag-changes)
\r
128 +(defun notmuch-pick-tag-thread (tag-changes)
\r
129 "Tag all messages in the current thread"
\r
132 + (let ((tags (apply #'append (notmuch-pick-thread-mapcar
\r
133 + (lambda () (notmuch-pick-get-tags))))))
\r
134 + (list (notmuch-read-tag-changes tags "Tag thread"))))
\r
135 (when (notmuch-pick-get-message-properties)
\r
136 - (let ((tag-changes (notmuch-tag (notmuch-pick-get-messages-ids-thread-search) tag-changes)))
\r
137 - (notmuch-pick-thread-mapcar
\r
138 - (lambda () (notmuch-pick-tag-update-display tag-changes))))))
\r
139 + (notmuch-tag (notmuch-pick-get-messages-ids-thread-search) tag-changes)
\r
140 + (notmuch-pick-thread-mapcar
\r
141 + (lambda () (notmuch-pick-tag-update-display tag-changes)))))
\r
143 (defun notmuch-pick-archive-thread (&optional unarchive)
\r
144 "Archive each message in thread.
\r