1 Return-Path: <dmitry.kurochkin@gmail.com>
\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 AAA94429E20
\r
6 for <notmuch@notmuchmail.org>; Mon, 9 May 2011 09:04:44 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id ukdbGguqfuRt for <notmuch@notmuchmail.org>;
\r
17 Mon, 9 May 2011 09:04:44 -0700 (PDT)
\r
18 Received: from mail-fx0-f53.google.com (mail-fx0-f53.google.com
\r
19 [209.85.161.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id 14D7C431FB5
\r
22 for <notmuch@notmuchmail.org>; Mon, 9 May 2011 09:04:43 -0700 (PDT)
\r
23 Received: by fxm8 with SMTP id 8so4000778fxm.26
\r
24 for <notmuch@notmuchmail.org>; Mon, 09 May 2011 09:04:42 -0700 (PDT)
\r
25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
\r
26 h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer;
\r
27 bh=vFkJJQhTK6dUJk248AM/MurAGWBXi437xMV1vUMNPoI=;
\r
28 b=mnaTj+/fPEAhSAoxV7NXLTUITxQEio0i0FYxBhU9RIZpjqSF6B+Z5izMFi0IuNDDq/
\r
29 o9UBGt+iVH5/5vMkCP6QS5EV5EllimtPxdCcvncgmTGPtKPIs5IJNBZfSGNFKmzyKLHh
\r
30 e6Cg3D8010ejzeDoEcWGCGwq0ib80fnaRuH+c=
\r
31 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
\r
32 h=from:to:cc:subject:date:message-id:x-mailer;
\r
33 b=O5oHIP0LIPbhfWJx+E1UUWBciOzk9+dIn9tySdKLdP06Sb8YSym9VfD5LmJZjZYDCg
\r
34 LDPUIuiKxrelYNPa+ff3EE8VBd6yPisfbp6T82DAW//VGPvgEHL9gurKwm9EfJKUUZyB
\r
35 rPNHMQNbRDbtyKnXnWRVOucmrFhn6CVYYCv14=
\r
36 Received: by 10.223.83.3 with SMTP id d3mr1700252fal.89.1304957082384;
\r
37 Mon, 09 May 2011 09:04:42 -0700 (PDT)
\r
38 Received: from localhost ([91.144.186.21])
\r
39 by mx.google.com with ESMTPS id s17sm570087fau.37.2011.05.09.09.04.41
\r
40 (version=TLSv1/SSLv3 cipher=OTHER);
\r
41 Mon, 09 May 2011 09:04:41 -0700 (PDT)
\r
42 From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>
\r
43 To: Notmuch Mail <notmuch@notmuchmail.org>
\r
44 Subject: [PATCH] Fix old style notmuch-fcc-dirs configuration check.
\r
45 Date: Mon, 9 May 2011 20:04:54 +0400
\r
46 Message-Id: <1304957094-30394-1-git-send-email-dmitry.kurochkin@gmail.com>
\r
47 X-Mailer: git-send-email 1.7.5.1
\r
48 X-BeenThere: notmuch@notmuchmail.org
\r
49 X-Mailman-Version: 2.1.13
\r
51 List-Id: "Use and development of the notmuch mail system."
\r
52 <notmuch.notmuchmail.org>
\r
53 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
54 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
55 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
56 List-Post: <mailto:notmuch@notmuchmail.org>
\r
57 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
58 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
59 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
60 X-List-Received-Date: Mon, 09 May 2011 16:04:44 -0000
\r
62 In notmuch 0.5 notmuch-fcc-dirs style changed. The previous code
\r
63 did not correctly identify an old configuration and, as a
\r
64 consequence, broke new configurations.
\r
66 The fix was extracted from a bigger patch series by David
\r
67 Edmondson id:"1290682750-30283-2-git-send-email-dme@dme.org".
\r
70 The patch is for the release-candidate/0.6 branch.
\r
76 emacs/notmuch-maildir-fcc.el | 2 +-
\r
77 1 files changed, 1 insertions(+), 1 deletions(-)
\r
79 diff --git a/emacs/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el
\r
80 index aede753..b6c6e2a 100644
\r
81 --- a/emacs/notmuch-maildir-fcc.el
\r
82 +++ b/emacs/notmuch-maildir-fcc.el
\r
83 @@ -88,7 +88,7 @@ will NOT be removed or replaced."
\r
86 ((and (listp notmuch-fcc-dirs)
\r
87 - (= 1 (length (car notmuch-fcc-dirs))))
\r
88 + (stringp (car notmuch-fcc-dirs)))
\r
89 ;; Old style - no longer works.
\r
90 (error "Invalid `notmuch-fcc-dirs' setting (old style)"))
\r