--- /dev/null
+Return-Path: <amdragon@mit.edu>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id E8F43431FBC\r
+ for <notmuch@notmuchmail.org>; Mon, 3 Dec 2012 14:13:22 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id nYhkSnk+40hO for <notmuch@notmuchmail.org>;\r
+ Mon, 3 Dec 2012 14:13:19 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU\r
+ [18.7.68.36])\r
+ by olra.theworths.org (Postfix) with ESMTP id 2F501431FC4\r
+ for <notmuch@notmuchmail.org>; Mon, 3 Dec 2012 14:13:18 -0800 (PST)\r
+X-AuditID: 12074424-b7fe06d0000008f0-92-50bd23fda783\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+ by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 99.B9.02288.DF32DB05; Mon, 3 Dec 2012 17:13:17 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id qB3MDGE9030437; \r
+ Mon, 3 Dec 2012 17:13:17 -0500\r
+Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
+ (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qB3MDEcH011289\r
+ (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT);\r
+ Mon, 3 Dec 2012 17:13:15 -0500 (EST)\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.80)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1TfeGI-00043B-Dg; Mon, 03 Dec 2012 17:13:14 -0500\r
+Date: Mon, 3 Dec 2012 17:13:14 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: Jani Nikula <jani@nikula.org>\r
+Subject: Re: [PATCH] emacs: drop support for deprecated notmuch-folders\r
+Message-ID: <20121203221314.GG1020@mit.edu>\r
+References: <1354569824-27213-1-git-send-email-jani@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+Content-Disposition: inline\r
+In-Reply-To: <1354569824-27213-1-git-send-email-jani@nikula.org>\r
+User-Agent: Mutt/1.5.21 (2010-09-15)\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFmpmleLIzCtJLcpLzFFi42IR4hTV1v2rvDfA4MEKdYum6c4W12/OZHZg\r
+ 8rh1/zW7x7NVt5gDmKK4bFJSczLLUov07RK4MqbcbWQvWCpRcevuVLYGxsXCXYycHBICJhJX\r
+ 1jcxQ9hiEhfurWfrYuTiEBLYxygx4/NTJghnPaPEv7MLWSGcC0wSS85MhSpbwihx8uIqJpB+\r
+ FgEViT0bT4PNYhPQkNi2fzkjiC0ioCix+eR+MJtZQFri2+9msHphAXeJ7auug9XzCmhL3N7Q\r
+ wA5iCwnYS5yesYkVIi4ocXLmExaIXi2JG/9eAvVygM1Z/o8DJMwp4CDx+t5ZsDGiQCdMObmN\r
+ bQKj0Cwk3bOQdM9C6F7AyLyKUTYlt0o3NzEzpzg1Wbc4OTEvL7VI11wvN7NELzWldBMjKKzZ\r
+ XVR2MDYfUjrEKMDBqMTDO+HWngAh1sSy4srcQ4ySHExKorxSEnsDhPiS8lMqMxKLM+KLSnNS\r
+ iw8xSnAwK4nwvmYHyvGmJFZWpRblw6SkOViUxHmvp9z0FxJITyxJzU5NLUgtgsnKcHAoSfDW\r
+ KQE1ChalpqdWpGXmlCCkmTg4QYbzAA1fC1LDW1yQmFucmQ6RP8WoKCUOkRAASWSU5sH1wtLO\r
+ K0ZxoFeEebtBqniAKQuu+xXQYCagwS+EdoMMLklESEk1MOpIcpfXCquobGM96O2tJnbk1LGD\r
+ XxwP26U/mfEj0rX9rF1C5rbE9y7//V75q5U/1V3+QSVT/tHcmoh3XFciVedXL49NedEnf0X0\r
+ u5ZfelOhkOqnd7/iKhzrEyPdaz50MHiq3+Qrq83YFRv9fgMf89+22rWWK9dvb5N83bloXapE\r
+ zsatHkuXKbEUZyQaajEXFScCADs2d4sWAwAA\r
+Cc: notmuch@notmuchmail.org\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 03 Dec 2012 22:13:23 -0000\r
+\r
+LGTM. It's probably more reliable, too, since there are places where\r
+we reference notmuch-saved-searches (the variable) directly that may\r
+not pass through notmuch-hello first.\r
+\r
+Quoth Jani Nikula on Dec 03 at 11:23 pm:\r
+> Remove notmuch-folders which has been deprecated since\r
+> \r
+> commit a4669217600e4536dc0c49f0255af5e2d9bc183f\r
+> Author: Carl Worth <cworth@cworth.org>\r
+> Date: Mon Apr 26 22:42:07 2010 -0700\r
+> \r
+> emacs: Rip out all of the notmuch-folder code.\r
+> \r
+> This lets us simplify the notmuch-saved-searches code slightly.\r
+> ---\r
+> emacs/notmuch-hello.el | 7 +------\r
+> emacs/notmuch-lib.el | 19 ++-----------------\r
+> 2 files changed, 3 insertions(+), 23 deletions(-)\r
+> \r
+> diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el\r
+> index be50aae..6db62a0 100644\r
+> --- a/emacs/notmuch-hello.el\r
+> +++ b/emacs/notmuch-hello.el\r
+> @@ -689,7 +689,7 @@ following:\r
+> "Show an entry for each saved search and inboxed messages for each tag"\r
+> (notmuch-hello-insert-searches "What's in your inbox"\r
+> (append\r
+> - (notmuch-saved-searches)\r
+> + notmuch-saved-searches\r
+> (notmuch-hello-generate-tag-alist))\r
+> :filter "tag:inbox"))\r
+> \r
+> @@ -726,11 +726,6 @@ following:\r
+> "Run notmuch and display saved searches, known tags, etc."\r
+> (interactive)\r
+> \r
+> - ;; Jump through a hoop to get this value from the deprecated variable\r
+> - ;; name (`notmuch-folders') or from the default value.\r
+> - (unless notmuch-saved-searches\r
+> - (setq notmuch-saved-searches (notmuch-saved-searches)))\r
+> -\r
+> (if no-display\r
+> (set-buffer "*notmuch-hello*")\r
+> (switch-to-buffer "*notmuch-hello*"))\r
+> diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+> index 1d0ec17..3e8647d 100644\r
+> --- a/emacs/notmuch-lib.el\r
+> +++ b/emacs/notmuch-lib.el\r
+> @@ -77,7 +77,8 @@\r
+> (defvar notmuch-search-history nil\r
+> "Variable to store notmuch searches history.")\r
+> \r
+> -(defcustom notmuch-saved-searches nil\r
+> +(defcustom notmuch-saved-searches '(("inbox" . "tag:inbox")\r
+> + ("unread" . "tag:unread"))\r
+> "A list of saved searches to display."\r
+> :type '(alist :key-type string :value-type string)\r
+> :group 'notmuch-hello)\r
+> @@ -96,22 +97,6 @@ For example, if you wanted to remove an \"inbox\" tag and add an\r
+> :group 'notmuch-search\r
+> :group 'notmuch-show)\r
+> \r
+> -(defvar notmuch-folders nil\r
+> - "Deprecated name for what is now known as `notmuch-saved-searches'.")\r
+> -\r
+> -(defun notmuch-saved-searches ()\r
+> - "Common function for querying the notmuch-saved-searches variable.\r
+> -\r
+> -We do this as a function to support the old name of the\r
+> -variable (`notmuch-folders') as well as for the default value if\r
+> -the user hasn't set this variable with the old or new value."\r
+> - (if notmuch-saved-searches\r
+> - notmuch-saved-searches\r
+> - (if notmuch-folders\r
+> - notmuch-folders\r
+> - '(("inbox" . "tag:inbox")\r
+> - ("unread" . "tag:unread")))))\r
+> -\r
+> (defun notmuch-version ()\r
+> "Return a string with the notmuch version number."\r
+> (let ((long-string\r
projects / notmuch-archives.git / commitdiff