1 Return-Path: <markwalters1009@gmail.com>
\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 0A4EA429E4F
\r
6 for <notmuch@notmuchmail.org>; Wed, 29 Feb 2012 10:11:44 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0.201 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,
\r
14 RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
15 Received: from olra.theworths.org ([127.0.0.1])
\r
16 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
17 with ESMTP id HngYUhcPH4i1 for <notmuch@notmuchmail.org>;
\r
18 Wed, 29 Feb 2012 10:11:43 -0800 (PST)
\r
19 Received: from mail-we0-f181.google.com (mail-we0-f181.google.com
\r
20 [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
21 (No client certificate requested)
\r
22 by olra.theworths.org (Postfix) with ESMTPS id 244EF429E38
\r
23 for <notmuch@notmuchmail.org>; Wed, 29 Feb 2012 10:11:43 -0800 (PST)
\r
24 Received: by werm13 with SMTP id m13so2259352wer.26
\r
25 for <notmuch@notmuchmail.org>; Wed, 29 Feb 2012 10:11:41 -0800 (PST)
\r
26 Received-SPF: pass (google.com: domain of markwalters1009@gmail.com designates
\r
27 10.180.83.97 as permitted sender) client-ip=10.180.83.97;
\r
28 Authentication-Results: mr.google.com; spf=pass (google.com: domain of
\r
29 markwalters1009@gmail.com designates 10.180.83.97 as permitted
\r
30 sender) smtp.mail=markwalters1009@gmail.com;
\r
31 dkim=pass header.i=markwalters1009@gmail.com
\r
32 Received: from mr.google.com ([10.180.83.97])
\r
33 by 10.180.83.97 with SMTP id p1mr3064624wiy.19.1330539101996 (num_hops
\r
34 = 1); Wed, 29 Feb 2012 10:11:41 -0800 (PST)
\r
35 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
\r
36 h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;
\r
37 bh=gXvvTQoOszPgLEG5Ws2kbqJ7A9hg6wpzZej+xW6lea8=;
\r
38 b=GiklfzzpcWQsupQpxzTxntqwBcfO478r7EFt3gnptu3/TYVZcX612IS1TBP+mqz3yK
\r
39 NZIc27fVLP6ltahBYw2e75UONR7KtCPGp2q1SSAx8Yep6bdHjn953289xf6TPI+4qWxb
\r
40 u2avDrVRJYqgEIQqbYt+1eWottOuvKfEqP2WQ=
\r
41 Received: by 10.180.83.97 with SMTP id p1mr2462073wiy.19.1330539101954;
\r
42 Wed, 29 Feb 2012 10:11:41 -0800 (PST)
\r
43 Received: from localhost (94-192-233-223.zone6.bethere.co.uk.
\r
44 [94.192.233.223]) by mx.google.com with ESMTPS id
\r
45 k6sm21812649wiy.7.2012.02.29.10.11.40 (version=TLSv1/SSLv3 cipher=OTHER);
\r
46 Wed, 29 Feb 2012 10:11:41 -0800 (PST)
\r
47 From: Mark Walters <markwalters1009@gmail.com>
\r
48 To: notmuch@notmuchmail.org
\r
49 Subject: [PATCH 4/5] cli: temporarily remove exclude tag support for 0.12
\r
50 Date: Wed, 29 Feb 2012 18:13:08 +0000
\r
51 Message-Id: <1330539189-16593-5-git-send-email-markwalters1009@gmail.com>
\r
52 X-Mailer: git-send-email 1.7.2.3
\r
53 In-Reply-To: <1330539189-16593-1-git-send-email-markwalters1009@gmail.com>
\r
54 References: <1330539189-16593-1-git-send-email-markwalters1009@gmail.com>
\r
55 X-BeenThere: notmuch@notmuchmail.org
\r
56 X-Mailman-Version: 2.1.13
\r
58 List-Id: "Use and development of the notmuch mail system."
\r
59 <notmuch.notmuchmail.org>
\r
60 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
61 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
62 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
63 List-Post: <mailto:notmuch@notmuchmail.org>
\r
64 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
65 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
66 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
67 X-List-Received-Date: Wed, 29 Feb 2012 18:11:44 -0000
\r
70 notmuch-count.c | 8 +-------
\r
71 notmuch-search.c | 8 +-------
\r
72 2 files changed, 2 insertions(+), 14 deletions(-)
\r
74 diff --git a/notmuch-count.c b/notmuch-count.c
\r
75 index 63459fb..f86cb40 100644
\r
76 --- a/notmuch-count.c
\r
77 +++ b/notmuch-count.c
\r
78 @@ -35,9 +35,6 @@ notmuch_count_command (void *ctx, int argc, char *argv[])
\r
81 int output = OUTPUT_MESSAGES;
\r
82 - const char **search_exclude_tags;
\r
83 - size_t search_exclude_tags_length;
\r
86 notmuch_opt_desc_t options[] = {
\r
87 { NOTMUCH_OPT_KEYWORD, &output, "output", 'o',
\r
88 @@ -78,10 +75,7 @@ notmuch_count_command (void *ctx, int argc, char *argv[])
\r
92 - search_exclude_tags = notmuch_config_get_search_exclude_tags
\r
93 - (config, &search_exclude_tags_length);
\r
94 - for (i = 0; i < search_exclude_tags_length; i++)
\r
95 - notmuch_query_add_tag_exclude (query, search_exclude_tags[i]);
\r
96 + /* Temporarily remove exclude tag support for 0.12 */
\r
99 case OUTPUT_MESSAGES:
\r
100 diff --git a/notmuch-search.c b/notmuch-search.c
\r
101 index 92ce38a..96892b3 100644
\r
102 --- a/notmuch-search.c
\r
103 +++ b/notmuch-search.c
\r
104 @@ -426,9 +426,6 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
\r
105 output_t output = OUTPUT_SUMMARY;
\r
107 int limit = -1; /* unlimited */
\r
108 - const char **search_exclude_tags;
\r
109 - size_t search_exclude_tags_length;
\r
112 enum { NOTMUCH_FORMAT_JSON, NOTMUCH_FORMAT_TEXT }
\r
113 format_sel = NOTMUCH_FORMAT_TEXT;
\r
114 @@ -496,10 +493,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
\r
116 notmuch_query_set_sort (query, sort);
\r
118 - search_exclude_tags = notmuch_config_get_search_exclude_tags
\r
119 - (config, &search_exclude_tags_length);
\r
120 - for (i = 0; i < search_exclude_tags_length; i++)
\r
121 - notmuch_query_add_tag_exclude (query, search_exclude_tags[i]);
\r
122 + /* Temporarily remove exclude tag support for 0.12 */
\r