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 AAA94429E20 for ; Mon, 9 May 2011 09:04:44 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.799 X-Spam-Level: X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] 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 ukdbGguqfuRt for ; Mon, 9 May 2011 09:04:44 -0700 (PDT) Received: from mail-fx0-f53.google.com (mail-fx0-f53.google.com [209.85.161.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 14D7C431FB5 for ; Mon, 9 May 2011 09:04:43 -0700 (PDT) Received: by fxm8 with SMTP id 8so4000778fxm.26 for ; Mon, 09 May 2011 09:04:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=vFkJJQhTK6dUJk248AM/MurAGWBXi437xMV1vUMNPoI=; b=mnaTj+/fPEAhSAoxV7NXLTUITxQEio0i0FYxBhU9RIZpjqSF6B+Z5izMFi0IuNDDq/ o9UBGt+iVH5/5vMkCP6QS5EV5EllimtPxdCcvncgmTGPtKPIs5IJNBZfSGNFKmzyKLHh e6Cg3D8010ejzeDoEcWGCGwq0ib80fnaRuH+c= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=O5oHIP0LIPbhfWJx+E1UUWBciOzk9+dIn9tySdKLdP06Sb8YSym9VfD5LmJZjZYDCg LDPUIuiKxrelYNPa+ff3EE8VBd6yPisfbp6T82DAW//VGPvgEHL9gurKwm9EfJKUUZyB rPNHMQNbRDbtyKnXnWRVOucmrFhn6CVYYCv14= Received: by 10.223.83.3 with SMTP id d3mr1700252fal.89.1304957082384; Mon, 09 May 2011 09:04:42 -0700 (PDT) Received: from localhost ([91.144.186.21]) by mx.google.com with ESMTPS id s17sm570087fau.37.2011.05.09.09.04.41 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 09 May 2011 09:04:41 -0700 (PDT) From: Dmitry Kurochkin To: Notmuch Mail Subject: [PATCH] Fix old style notmuch-fcc-dirs configuration check. Date: Mon, 9 May 2011 20:04:54 +0400 Message-Id: <1304957094-30394-1-git-send-email-dmitry.kurochkin@gmail.com> X-Mailer: git-send-email 1.7.5.1 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: Mon, 09 May 2011 16:04:44 -0000 In notmuch 0.5 notmuch-fcc-dirs style changed. The previous code did not correctly identify an old configuration and, as a consequence, broke new configurations. The fix was extracted from a bigger patch series by David Edmondson id:"1290682750-30283-2-git-send-email-dme@dme.org". --- The patch is for the release-candidate/0.6 branch. Regards, Dmitry emacs/notmuch-maildir-fcc.el | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/emacs/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el index aede753..b6c6e2a 100644 --- a/emacs/notmuch-maildir-fcc.el +++ b/emacs/notmuch-maildir-fcc.el @@ -88,7 +88,7 @@ will NOT be removed or replaced." notmuch-fcc-dirs) ((and (listp notmuch-fcc-dirs) - (= 1 (length (car notmuch-fcc-dirs)))) + (stringp (car notmuch-fcc-dirs))) ;; Old style - no longer works. (error "Invalid `notmuch-fcc-dirs' setting (old style)")) -- 1.7.5.1