1 Return-Path: <cworth@cworth.org>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id C1110431FD0
\r
6 for <notmuch@notmuchmail.org>; Wed, 24 Nov 2010 13:00:45 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-1 tagged_above=-999 required=5
\r
12 tests=[ALL_TRUSTED=-1] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id 56-p2nSuWX8g; Wed, 24 Nov 2010 13:00:45 -0800 (PST)
\r
16 Received: from yoom.amr.corp.intel.com (localhost [127.0.0.1])
\r
17 by olra.theworths.org (Postfix) with ESMTP id 09401431FB5;
\r
18 Wed, 24 Nov 2010 13:00:44 -0800 (PST)
\r
19 From: Carl Worth <cworth@cworth.org>
\r
20 To: notmuch@notmuchmail.org
\r
21 Subject: [PATCH] Workaround broken check for old-style notmuch-fcc-dirs
\r
22 Date: Wed, 24 Nov 2010 13:00:44 -0800
\r
23 Message-Id: <1290632444-10046-1-git-send-email-cworth@cworth.org>
\r
24 X-Mailer: git-send-email 1.7.2.3
\r
25 X-BeenThere: notmuch@notmuchmail.org
\r
26 X-Mailman-Version: 2.1.13
\r
28 List-Id: "Use and development of the notmuch mail system."
\r
29 <notmuch.notmuchmail.org>
\r
30 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
31 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
32 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
33 List-Post: <mailto:notmuch@notmuchmail.org>
\r
34 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
35 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
36 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
37 X-List-Received-Date: Wed, 24 Nov 2010 21:00:45 -0000
\r
39 This check actually makes a new-style setting not work.
\r
41 emacs/notmuch-maildir-fcc.el | 8 ++++----
\r
42 1 files changed, 4 insertions(+), 4 deletions(-)
\r
44 I don't intend this commit for the central repository. Better would be
\r
45 a new test case for a new-style notmuch-fcc-dirs setting, then a fix
\r
46 to make the code below work as intended (rather than being commented
\r
49 diff --git a/emacs/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el
\r
50 index e5e0549..54d5528 100644
\r
51 --- a/emacs/notmuch-maildir-fcc.el
\r
52 +++ b/emacs/notmuch-maildir-fcc.el
\r
53 @@ -87,10 +87,10 @@ will NOT be removed or replaced."
\r
54 ((stringp notmuch-fcc-dirs)
\r
57 - ((and (listp notmuch-fcc-dirs)
\r
58 - (= 1 (length (car notmuch-fcc-dirs))))
\r
59 - ;; Old style - no longer works.
\r
60 - (error "Invalid `notmuch-fcc-dirs' setting (old style)"))
\r
61 +; ((and (listp notmuch-fcc-dirs)
\r
62 +; (= 1 (length (car notmuch-fcc-dirs))))
\r
63 +; ;; Old style - no longer works.
\r
64 +; (error "Invalid `notmuch-fcc-dirs' setting (old style)"))
\r
66 ((listp notmuch-fcc-dirs)
\r
67 (let* ((from (message-fetch-field "From"))
\r