--- /dev/null
+Return-Path: <jani@nikula.org>\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 43F5C431FB6\r
+ for <notmuch@notmuchmail.org>; Mon, 3 Dec 2012 13:23:54 -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 kMUBgYG2bjUK for <notmuch@notmuchmail.org>;\r
+ Mon, 3 Dec 2012 13:23:50 -0800 (PST)\r
+Received: from mail-la0-f53.google.com (mail-la0-f53.google.com\r
+ [209.85.215.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 00901431FAE\r
+ for <notmuch@notmuchmail.org>; Mon, 3 Dec 2012 13:23:49 -0800 (PST)\r
+Received: by mail-la0-f53.google.com with SMTP id w12so2771343lag.26\r
+ for <notmuch@notmuchmail.org>; Mon, 03 Dec 2012 13:23:48 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=google.com; s=20120113;\r
+ h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state;\r
+ bh=ZcEY5rtI8/fyd9B6Mya0g/eZcGjiiUuS5oxj2zw8k5Y=;\r
+ b=CsHJTtC/wKhOEYyQV9MSv7avgUPoHA7aVmJafeCBas5HUBEWCoPh47VOwuR93jJhUz\r
+ YXdAa2kASTsVWZ9ZXfzIvhmmN6+MuiMZNJeVRCWY4SCZNqnGX/aeHvZhUZkwOiNG08bM\r
+ /RQM9TAKp/HPy5qZf3RnknbZyYManPJ11HdSsmqOXldY7EqwxOOiHhkvIQFiNJhZuLr9\r
+ 2K1XdfYHij2eXOuUUVZlIK7p9NVOgAotw2SwZv0gdzlp9q8TN+kTud/RWr6t/hg54BOJ\r
+ xGrp7/8fLZCBsGu7onjaK8wCwkvRP2Kh1gNPftSnWrmkdRvj367OueqONSGz3m3O1P1W\r
+ YCfA==\r
+Received: by 10.112.29.10 with SMTP id f10mr4885090lbh.4.1354569828253;\r
+ Mon, 03 Dec 2012 13:23:48 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw4-fe51df00-27.dhcp.inet.fi.\r
+ [80.223.81.27])\r
+ by mx.google.com with ESMTPS id z9sm5950836lby.8.2012.12.03.13.23.45\r
+ (version=SSLv3 cipher=OTHER); Mon, 03 Dec 2012 13:23:46 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] emacs: drop support for deprecated notmuch-folders\r
+Date: Mon, 3 Dec 2012 23:23:44 +0200\r
+Message-Id: <1354569824-27213-1-git-send-email-jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.10.4\r
+X-Gm-Message-State:\r
+ ALoCoQkdgSiDw7gYnrrJ54Hc4UWVvLhn5KGGKOpQEPRt2d1jFIA+XzNcCmhD7cobrcWH+YggYWon\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 21:23:54 -0000\r
+\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
+-- \r
+1.7.10.4\r
+\r
projects / notmuch-archives.git / commitdiff