[PATCH 14/25] Fix old style notmuch-fcc-dirs configuration check.

diff --git a/e2/ecdb9cb97c533f2f7697f77552defa4c7ab620 b/e2/ecdb9cb97c533f2f7697f77552defa4c7ab620
new file mode 100644 (file)
index 0000000..58c4e12
--- /dev/null
+++ b/e2/ecdb9cb97c533f2f7697f77552defa4c7ab620
@@ -0,0 +1,96 @@
+Return-Path: <jrollins@servo.finestructure.net>\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 8E2DF429E53\r
+       for <notmuch@notmuchmail.org>; Sat, 28 May 2011 14:52:21 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.921\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.921 tagged_above=-999 required=5\r
+       tests=[NO_DNS_FOR_FROM=0.379, RCVD_IN_DNSWL_MED=-2.3]\r
+       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 thUk3d54f-2h for <notmuch@notmuchmail.org>;\r
+       Sat, 28 May 2011 14:52:20 -0700 (PDT)\r
+Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu\r
+       [131.215.239.19])\r
+       by olra.theworths.org (Postfix) with ESMTP id CFA74429E28\r
+       for <notmuch@notmuchmail.org>; Sat, 28 May 2011 14:52:14 -0700 (PDT)\r
+Received: from earth-doxen.imss.caltech.edu (localhost [127.0.0.1])\r
+       by earth-doxen-postvirus (Postfix) with ESMTP id 4C2C066E034C;\r
+       Sat, 28 May 2011 14:52:13 -0700 (PDT)\r
+X-Spam-Scanned: at Caltech-IMSS on earth-doxen by amavisd-new\r
+Received: from servo.finestructure.net (cpe-98-149-172-122.socal.res.rr.com\r
+       [98.149.172.122]) (Authenticated sender: jrollins)\r
+       by earth-doxen-submit (Postfix) with ESMTP id 6FA2866E022C;\r
+       Sat, 28 May 2011 14:52:09 -0700 (PDT)\r
+Received: by servo.finestructure.net (Postfix, from userid 1000)\r
+       id 4245B7E8; Sat, 28 May 2011 14:52:05 -0700 (PDT)\r
+From: Jameson Graef Rollins <jrollins@finestructure.net>\r
+To: Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: [PATCH 14/25] Fix old style notmuch-fcc-dirs configuration check.\r
+Date: Sat, 28 May 2011 14:51:49 -0700\r
+Message-Id: <1306619520-25730-15-git-send-email-jrollins@finestructure.net>\r
+X-Mailer: git-send-email 1.7.4.4\r
+In-Reply-To: <1306619520-25730-14-git-send-email-jrollins@finestructure.net>\r
+References: <1306619520-25730-1-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-2-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-3-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-4-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-5-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-6-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-7-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-8-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-9-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-10-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-11-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-12-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-13-git-send-email-jrollins@finestructure.net>\r
+       <1306619520-25730-14-git-send-email-jrollins@finestructure.net>\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: Sat, 28 May 2011 21:52:22 -0000\r
+\r
+From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
+\r
+In notmuch 0.5 notmuch-fcc-dirs style changed.  The previous code\r
+did not correctly identify an old configuration and, as a\r
+consequence, broke new configurations.\r
+\r
+The fix was extracted from a bigger patch series by David\r
+Edmondson id:"1290682750-30283-2-git-send-email-dme@dme.org".\r
+\r
+Signed-off-by: Jameson Graef Rollins <jrollins@finestructure.net>\r
+---\r
+ emacs/notmuch-maildir-fcc.el |    2 +-\r
+ 1 files changed, 1 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el\r
+index 3f1c124..b79f6a3 100644\r
+--- a/emacs/notmuch-maildir-fcc.el\r
++++ b/emacs/notmuch-maildir-fcc.el\r
+@@ -88,7 +88,7 @@ will NOT be removed or replaced."\r
+          notmuch-fcc-dirs)\r
+ \r
+         ((and (listp notmuch-fcc-dirs)\r
+-              (= 1 (length (car notmuch-fcc-dirs))))\r
++              (stringp (car notmuch-fcc-dirs)))\r
+          ;; Old style - no longer works.\r
+          (error "Invalid `notmuch-fcc-dirs' setting (old style)"))\r
+ \r
+-- \r
+1.7.4.4\r
+\r