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 C1110431FD0 for ; Wed, 24 Nov 2010 13:00:45 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -1 X-Spam-Level: X-Spam-Status: No, score=-1 tagged_above=-999 required=5 tests=[ALL_TRUSTED=-1] 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 56-p2nSuWX8g; Wed, 24 Nov 2010 13:00:45 -0800 (PST) Received: from yoom.amr.corp.intel.com (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 09401431FB5; Wed, 24 Nov 2010 13:00:44 -0800 (PST) From: Carl Worth To: notmuch@notmuchmail.org Subject: [PATCH] Workaround broken check for old-style notmuch-fcc-dirs Date: Wed, 24 Nov 2010 13:00:44 -0800 Message-Id: <1290632444-10046-1-git-send-email-cworth@cworth.org> X-Mailer: git-send-email 1.7.2.3 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: Wed, 24 Nov 2010 21:00:45 -0000 This check actually makes a new-style setting not work. --- emacs/notmuch-maildir-fcc.el | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) I don't intend this commit for the central repository. Better would be a new test case for a new-style notmuch-fcc-dirs setting, then a fix to make the code below work as intended (rather than being commented out). diff --git a/emacs/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el index e5e0549..54d5528 100644 --- a/emacs/notmuch-maildir-fcc.el +++ b/emacs/notmuch-maildir-fcc.el @@ -87,10 +87,10 @@ will NOT be removed or replaced." ((stringp notmuch-fcc-dirs) notmuch-fcc-dirs) - ((and (listp notmuch-fcc-dirs) - (= 1 (length (car notmuch-fcc-dirs)))) - ;; Old style - no longer works. - (error "Invalid `notmuch-fcc-dirs' setting (old style)")) +; ((and (listp notmuch-fcc-dirs) +; (= 1 (length (car notmuch-fcc-dirs)))) +; ;; Old style - no longer works. +; (error "Invalid `notmuch-fcc-dirs' setting (old style)")) ((listp notmuch-fcc-dirs) (let* ((from (message-fetch-field "From")) -- 1.7.2.3