1 Return-Path: <jani@nikula.org>
\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 43F5C431FB6
\r
6 for <notmuch@notmuchmail.org>; Mon, 3 Dec 2012 13:23:54 -0800 (PST)
\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 kMUBgYG2bjUK for <notmuch@notmuchmail.org>;
\r
16 Mon, 3 Dec 2012 13:23:50 -0800 (PST)
\r
17 Received: from mail-la0-f53.google.com (mail-la0-f53.google.com
\r
18 [209.85.215.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 00901431FAE
\r
21 for <notmuch@notmuchmail.org>; Mon, 3 Dec 2012 13:23:49 -0800 (PST)
\r
22 Received: by mail-la0-f53.google.com with SMTP id w12so2771343lag.26
\r
23 for <notmuch@notmuchmail.org>; Mon, 03 Dec 2012 13:23:48 -0800 (PST)
\r
24 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
\r
25 d=google.com; s=20120113;
\r
26 h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state;
\r
27 bh=ZcEY5rtI8/fyd9B6Mya0g/eZcGjiiUuS5oxj2zw8k5Y=;
\r
28 b=CsHJTtC/wKhOEYyQV9MSv7avgUPoHA7aVmJafeCBas5HUBEWCoPh47VOwuR93jJhUz
\r
29 YXdAa2kASTsVWZ9ZXfzIvhmmN6+MuiMZNJeVRCWY4SCZNqnGX/aeHvZhUZkwOiNG08bM
\r
30 /RQM9TAKp/HPy5qZf3RnknbZyYManPJ11HdSsmqOXldY7EqwxOOiHhkvIQFiNJhZuLr9
\r
31 2K1XdfYHij2eXOuUUVZlIK7p9NVOgAotw2SwZv0gdzlp9q8TN+kTud/RWr6t/hg54BOJ
\r
32 xGrp7/8fLZCBsGu7onjaK8wCwkvRP2Kh1gNPftSnWrmkdRvj367OueqONSGz3m3O1P1W
\r
34 Received: by 10.112.29.10 with SMTP id f10mr4885090lbh.4.1354569828253;
\r
35 Mon, 03 Dec 2012 13:23:48 -0800 (PST)
\r
36 Received: from localhost (dsl-hkibrasgw4-fe51df00-27.dhcp.inet.fi.
\r
38 by mx.google.com with ESMTPS id z9sm5950836lby.8.2012.12.03.13.23.45
\r
39 (version=SSLv3 cipher=OTHER); Mon, 03 Dec 2012 13:23:46 -0800 (PST)
\r
40 From: Jani Nikula <jani@nikula.org>
\r
41 To: notmuch@notmuchmail.org
\r
42 Subject: [PATCH] emacs: drop support for deprecated notmuch-folders
\r
43 Date: Mon, 3 Dec 2012 23:23:44 +0200
\r
44 Message-Id: <1354569824-27213-1-git-send-email-jani@nikula.org>
\r
45 X-Mailer: git-send-email 1.7.10.4
\r
47 ALoCoQkdgSiDw7gYnrrJ54Hc4UWVvLhn5KGGKOpQEPRt2d1jFIA+XzNcCmhD7cobrcWH+YggYWon
\r
48 X-BeenThere: notmuch@notmuchmail.org
\r
49 X-Mailman-Version: 2.1.13
\r
51 List-Id: "Use and development of the notmuch mail system."
\r
52 <notmuch.notmuchmail.org>
\r
53 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
54 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
55 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
56 List-Post: <mailto:notmuch@notmuchmail.org>
\r
57 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
58 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
59 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
60 X-List-Received-Date: Mon, 03 Dec 2012 21:23:54 -0000
\r
62 Remove notmuch-folders which has been deprecated since
\r
64 commit a4669217600e4536dc0c49f0255af5e2d9bc183f
\r
65 Author: Carl Worth <cworth@cworth.org>
\r
66 Date: Mon Apr 26 22:42:07 2010 -0700
\r
68 emacs: Rip out all of the notmuch-folder code.
\r
70 This lets us simplify the notmuch-saved-searches code slightly.
\r
72 emacs/notmuch-hello.el | 7 +------
\r
73 emacs/notmuch-lib.el | 19 ++-----------------
\r
74 2 files changed, 3 insertions(+), 23 deletions(-)
\r
76 diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
\r
77 index be50aae..6db62a0 100644
\r
78 --- a/emacs/notmuch-hello.el
\r
79 +++ b/emacs/notmuch-hello.el
\r
80 @@ -689,7 +689,7 @@ following:
\r
81 "Show an entry for each saved search and inboxed messages for each tag"
\r
82 (notmuch-hello-insert-searches "What's in your inbox"
\r
84 - (notmuch-saved-searches)
\r
85 + notmuch-saved-searches
\r
86 (notmuch-hello-generate-tag-alist))
\r
87 :filter "tag:inbox"))
\r
89 @@ -726,11 +726,6 @@ following:
\r
90 "Run notmuch and display saved searches, known tags, etc."
\r
93 - ;; Jump through a hoop to get this value from the deprecated variable
\r
94 - ;; name (`notmuch-folders') or from the default value.
\r
95 - (unless notmuch-saved-searches
\r
96 - (setq notmuch-saved-searches (notmuch-saved-searches)))
\r
99 (set-buffer "*notmuch-hello*")
\r
100 (switch-to-buffer "*notmuch-hello*"))
\r
101 diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
\r
102 index 1d0ec17..3e8647d 100644
\r
103 --- a/emacs/notmuch-lib.el
\r
104 +++ b/emacs/notmuch-lib.el
\r
106 (defvar notmuch-search-history nil
\r
107 "Variable to store notmuch searches history.")
\r
109 -(defcustom notmuch-saved-searches nil
\r
110 +(defcustom notmuch-saved-searches '(("inbox" . "tag:inbox")
\r
111 + ("unread" . "tag:unread"))
\r
112 "A list of saved searches to display."
\r
113 :type '(alist :key-type string :value-type string)
\r
114 :group 'notmuch-hello)
\r
115 @@ -96,22 +97,6 @@ For example, if you wanted to remove an \"inbox\" tag and add an
\r
116 :group 'notmuch-search
\r
117 :group 'notmuch-show)
\r
119 -(defvar notmuch-folders nil
\r
120 - "Deprecated name for what is now known as `notmuch-saved-searches'.")
\r
122 -(defun notmuch-saved-searches ()
\r
123 - "Common function for querying the notmuch-saved-searches variable.
\r
125 -We do this as a function to support the old name of the
\r
126 -variable (`notmuch-folders') as well as for the default value if
\r
127 -the user hasn't set this variable with the old or new value."
\r
128 - (if notmuch-saved-searches
\r
129 - notmuch-saved-searches
\r
130 - (if notmuch-folders
\r
132 - '(("inbox" . "tag:inbox")
\r
133 - ("unread" . "tag:unread")))))
\r
135 (defun notmuch-version ()
\r
136 "Return a string with the notmuch version number."
\r