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 E8F43431FBC
\r
6 for <notmuch@notmuchmail.org>; Mon, 3 Dec 2012 14:13:22 -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 nYhkSnk+40hO for <notmuch@notmuchmail.org>;
\r
16 Mon, 3 Dec 2012 14:13:19 -0800 (PST)
\r
17 Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU
\r
19 by olra.theworths.org (Postfix) with ESMTP id 2F501431FC4
\r
20 for <notmuch@notmuchmail.org>; Mon, 3 Dec 2012 14:13:18 -0800 (PST)
\r
21 X-AuditID: 12074424-b7fe06d0000008f0-92-50bd23fda783
\r
22 Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])
\r
23 by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP
\r
24 id 99.B9.02288.DF32DB05; Mon, 3 Dec 2012 17:13:17 -0500 (EST)
\r
25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])
\r
26 by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id qB3MDGE9030437;
\r
27 Mon, 3 Dec 2012 17:13:17 -0500
\r
28 Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])
\r
29 (authenticated bits=0)
\r
30 (User authenticated as amdragon@ATHENA.MIT.EDU)
\r
31 by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qB3MDEcH011289
\r
32 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT);
\r
33 Mon, 3 Dec 2012 17:13:15 -0500 (EST)
\r
34 Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.80)
\r
35 (envelope-from <amdragon@mit.edu>)
\r
36 id 1TfeGI-00043B-Dg; Mon, 03 Dec 2012 17:13:14 -0500
\r
37 Date: Mon, 3 Dec 2012 17:13:14 -0500
\r
38 From: Austin Clements <amdragon@MIT.EDU>
\r
39 To: Jani Nikula <jani@nikula.org>
\r
40 Subject: Re: [PATCH] emacs: drop support for deprecated notmuch-folders
\r
41 Message-ID: <20121203221314.GG1020@mit.edu>
\r
42 References: <1354569824-27213-1-git-send-email-jani@nikula.org>
\r
44 Content-Type: text/plain; charset=us-ascii
\r
45 Content-Disposition: inline
\r
46 In-Reply-To: <1354569824-27213-1-git-send-email-jani@nikula.org>
\r
47 User-Agent: Mutt/1.5.21 (2010-09-15)
\r
48 X-Brightmail-Tracker:
\r
49 H4sIAAAAAAAAA+NgFmpmleLIzCtJLcpLzFFi42IR4hTV1v2rvDfA4MEKdYum6c4W12/OZHZg
\r
50 8rh1/zW7x7NVt5gDmKK4bFJSczLLUov07RK4MqbcbWQvWCpRcevuVLYGxsXCXYycHBICJhJX
\r
51 1jcxQ9hiEhfurWfrYuTiEBLYxygx4/NTJghnPaPEv7MLWSGcC0wSS85MhSpbwihx8uIqJpB+
\r
52 FgEViT0bT4PNYhPQkNi2fzkjiC0ioCix+eR+MJtZQFri2+9msHphAXeJ7auug9XzCmhL3N7Q
\r
53 wA5iCwnYS5yesYkVIi4ocXLmExaIXi2JG/9eAvVygM1Z/o8DJMwp4CDx+t5ZsDGiQCdMObmN
\r
54 bQKj0Cwk3bOQdM9C6F7AyLyKUTYlt0o3NzEzpzg1Wbc4OTEvL7VI11wvN7NELzWldBMjKKzZ
\r
55 XVR2MDYfUjrEKMDBqMTDO+HWngAh1sSy4srcQ4ySHExKorxSEnsDhPiS8lMqMxKLM+KLSnNS
\r
56 iw8xSnAwK4nwvmYHyvGmJFZWpRblw6SkOViUxHmvp9z0FxJITyxJzU5NLUgtgsnKcHAoSfDW
\r
57 KQE1ChalpqdWpGXmlCCkmTg4QYbzAA1fC1LDW1yQmFucmQ6RP8WoKCUOkRAASWSU5sH1wtLO
\r
58 K0ZxoFeEebtBqniAKQuu+xXQYCagwS+EdoMMLklESEk1MOpIcpfXCquobGM96O2tJnbk1LGD
\r
59 XxwP26U/mfEj0rX9rF1C5rbE9y7//V75q5U/1V3+QSVT/tHcmoh3XFciVedXL49NedEnf0X0
\r
60 u5ZfelOhkOqnd7/iKhzrEyPdaz50MHiq3+Qrq83YFRv9fgMf89+22rWWK9dvb5N83bloXapE
\r
61 zsatHkuXKbEUZyQaajEXFScCADs2d4sWAwAA
\r
62 Cc: notmuch@notmuchmail.org
\r
63 X-BeenThere: notmuch@notmuchmail.org
\r
64 X-Mailman-Version: 2.1.13
\r
66 List-Id: "Use and development of the notmuch mail system."
\r
67 <notmuch.notmuchmail.org>
\r
68 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
69 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
70 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
71 List-Post: <mailto:notmuch@notmuchmail.org>
\r
72 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
73 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
74 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
75 X-List-Received-Date: Mon, 03 Dec 2012 22:13:23 -0000
\r
77 LGTM. It's probably more reliable, too, since there are places where
\r
78 we reference notmuch-saved-searches (the variable) directly that may
\r
79 not pass through notmuch-hello first.
\r
81 Quoth Jani Nikula on Dec 03 at 11:23 pm:
\r
82 > Remove notmuch-folders which has been deprecated since
\r
84 > commit a4669217600e4536dc0c49f0255af5e2d9bc183f
\r
85 > Author: Carl Worth <cworth@cworth.org>
\r
86 > Date: Mon Apr 26 22:42:07 2010 -0700
\r
88 > emacs: Rip out all of the notmuch-folder code.
\r
90 > This lets us simplify the notmuch-saved-searches code slightly.
\r
92 > emacs/notmuch-hello.el | 7 +------
\r
93 > emacs/notmuch-lib.el | 19 ++-----------------
\r
94 > 2 files changed, 3 insertions(+), 23 deletions(-)
\r
96 > diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
\r
97 > index be50aae..6db62a0 100644
\r
98 > --- a/emacs/notmuch-hello.el
\r
99 > +++ b/emacs/notmuch-hello.el
\r
100 > @@ -689,7 +689,7 @@ following:
\r
101 > "Show an entry for each saved search and inboxed messages for each tag"
\r
102 > (notmuch-hello-insert-searches "What's in your inbox"
\r
104 > - (notmuch-saved-searches)
\r
105 > + notmuch-saved-searches
\r
106 > (notmuch-hello-generate-tag-alist))
\r
107 > :filter "tag:inbox"))
\r
109 > @@ -726,11 +726,6 @@ following:
\r
110 > "Run notmuch and display saved searches, known tags, etc."
\r
113 > - ;; Jump through a hoop to get this value from the deprecated variable
\r
114 > - ;; name (`notmuch-folders') or from the default value.
\r
115 > - (unless notmuch-saved-searches
\r
116 > - (setq notmuch-saved-searches (notmuch-saved-searches)))
\r
119 > (set-buffer "*notmuch-hello*")
\r
120 > (switch-to-buffer "*notmuch-hello*"))
\r
121 > diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
\r
122 > index 1d0ec17..3e8647d 100644
\r
123 > --- a/emacs/notmuch-lib.el
\r
124 > +++ b/emacs/notmuch-lib.el
\r
125 > @@ -77,7 +77,8 @@
\r
126 > (defvar notmuch-search-history nil
\r
127 > "Variable to store notmuch searches history.")
\r
129 > -(defcustom notmuch-saved-searches nil
\r
130 > +(defcustom notmuch-saved-searches '(("inbox" . "tag:inbox")
\r
131 > + ("unread" . "tag:unread"))
\r
132 > "A list of saved searches to display."
\r
133 > :type '(alist :key-type string :value-type string)
\r
134 > :group 'notmuch-hello)
\r
135 > @@ -96,22 +97,6 @@ For example, if you wanted to remove an \"inbox\" tag and add an
\r
136 > :group 'notmuch-search
\r
137 > :group 'notmuch-show)
\r
139 > -(defvar notmuch-folders nil
\r
140 > - "Deprecated name for what is now known as `notmuch-saved-searches'.")
\r
142 > -(defun notmuch-saved-searches ()
\r
143 > - "Common function for querying the notmuch-saved-searches variable.
\r
145 > -We do this as a function to support the old name of the
\r
146 > -variable (`notmuch-folders') as well as for the default value if
\r
147 > -the user hasn't set this variable with the old or new value."
\r
148 > - (if notmuch-saved-searches
\r
149 > - notmuch-saved-searches
\r
150 > - (if notmuch-folders
\r
151 > - notmuch-folders
\r
152 > - '(("inbox" . "tag:inbox")
\r
153 > - ("unread" . "tag:unread")))))
\r
155 > (defun notmuch-version ()
\r
156 > "Return a string with the notmuch version number."
\r
157 > (let ((long-string
\r