Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 43F5C431FB6 for ; Mon, 3 Dec 2012 13:23:54 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.7 X-Spam-Level: X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kMUBgYG2bjUK for ; Mon, 3 Dec 2012 13:23:50 -0800 (PST) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com [209.85.215.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 00901431FAE for ; Mon, 3 Dec 2012 13:23:49 -0800 (PST) Received: by mail-la0-f53.google.com with SMTP id w12so2771343lag.26 for ; Mon, 03 Dec 2012 13:23:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=ZcEY5rtI8/fyd9B6Mya0g/eZcGjiiUuS5oxj2zw8k5Y=; b=CsHJTtC/wKhOEYyQV9MSv7avgUPoHA7aVmJafeCBas5HUBEWCoPh47VOwuR93jJhUz YXdAa2kASTsVWZ9ZXfzIvhmmN6+MuiMZNJeVRCWY4SCZNqnGX/aeHvZhUZkwOiNG08bM /RQM9TAKp/HPy5qZf3RnknbZyYManPJ11HdSsmqOXldY7EqwxOOiHhkvIQFiNJhZuLr9 2K1XdfYHij2eXOuUUVZlIK7p9NVOgAotw2SwZv0gdzlp9q8TN+kTud/RWr6t/hg54BOJ xGrp7/8fLZCBsGu7onjaK8wCwkvRP2Kh1gNPftSnWrmkdRvj367OueqONSGz3m3O1P1W YCfA== Received: by 10.112.29.10 with SMTP id f10mr4885090lbh.4.1354569828253; Mon, 03 Dec 2012 13:23:48 -0800 (PST) Received: from localhost (dsl-hkibrasgw4-fe51df00-27.dhcp.inet.fi. [80.223.81.27]) by mx.google.com with ESMTPS id z9sm5950836lby.8.2012.12.03.13.23.45 (version=SSLv3 cipher=OTHER); Mon, 03 Dec 2012 13:23:46 -0800 (PST) From: Jani Nikula To: notmuch@notmuchmail.org Subject: [PATCH] emacs: drop support for deprecated notmuch-folders Date: Mon, 3 Dec 2012 23:23:44 +0200 Message-Id: <1354569824-27213-1-git-send-email-jani@nikula.org> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQkdgSiDw7gYnrrJ54Hc4UWVvLhn5KGGKOpQEPRt2d1jFIA+XzNcCmhD7cobrcWH+YggYWon X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Dec 2012 21:23:54 -0000 Remove notmuch-folders which has been deprecated since commit a4669217600e4536dc0c49f0255af5e2d9bc183f Author: Carl Worth Date: Mon Apr 26 22:42:07 2010 -0700 emacs: Rip out all of the notmuch-folder code. This lets us simplify the notmuch-saved-searches code slightly. --- emacs/notmuch-hello.el | 7 +------ emacs/notmuch-lib.el | 19 ++----------------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el index be50aae..6db62a0 100644 --- a/emacs/notmuch-hello.el +++ b/emacs/notmuch-hello.el @@ -689,7 +689,7 @@ following: "Show an entry for each saved search and inboxed messages for each tag" (notmuch-hello-insert-searches "What's in your inbox" (append - (notmuch-saved-searches) + notmuch-saved-searches (notmuch-hello-generate-tag-alist)) :filter "tag:inbox")) @@ -726,11 +726,6 @@ following: "Run notmuch and display saved searches, known tags, etc." (interactive) - ;; Jump through a hoop to get this value from the deprecated variable - ;; name (`notmuch-folders') or from the default value. - (unless notmuch-saved-searches - (setq notmuch-saved-searches (notmuch-saved-searches))) - (if no-display (set-buffer "*notmuch-hello*") (switch-to-buffer "*notmuch-hello*")) diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el index 1d0ec17..3e8647d 100644 --- a/emacs/notmuch-lib.el +++ b/emacs/notmuch-lib.el @@ -77,7 +77,8 @@ (defvar notmuch-search-history nil "Variable to store notmuch searches history.") -(defcustom notmuch-saved-searches nil +(defcustom notmuch-saved-searches '(("inbox" . "tag:inbox") + ("unread" . "tag:unread")) "A list of saved searches to display." :type '(alist :key-type string :value-type string) :group 'notmuch-hello) @@ -96,22 +97,6 @@ For example, if you wanted to remove an \"inbox\" tag and add an :group 'notmuch-search :group 'notmuch-show) -(defvar notmuch-folders nil - "Deprecated name for what is now known as `notmuch-saved-searches'.") - -(defun notmuch-saved-searches () - "Common function for querying the notmuch-saved-searches variable. - -We do this as a function to support the old name of the -variable (`notmuch-folders') as well as for the default value if -the user hasn't set this variable with the old or new value." - (if notmuch-saved-searches - notmuch-saved-searches - (if notmuch-folders - notmuch-folders - '(("inbox" . "tag:inbox") - ("unread" . "tag:unread"))))) - (defun notmuch-version () "Return a string with the notmuch version number." (let ((long-string -- 1.7.10.4