[PATCH] Workaround broken check for old-style notmuch-fcc-dirs

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