[PATCH] emacs: Remove conditional from notmuch-fcc-initialization.

diff --git a/1f/005981485cad28285b3dd0abda32d050a09b2b b/1f/005981485cad28285b3dd0abda32d050a09b2b
new file mode 100644 (file)
index 0000000..17409f3
--- /dev/null
+++ b/1f/005981485cad28285b3dd0abda32d050a09b2b
@@ -0,0 +1,83 @@
+Return-Path: <prvs=jrosenthal=72618203d@jhu.edu>\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 88C574196F0\r
+       for <notmuch@notmuchmail.org>; Tue, 27 Apr 2010 09:34:00 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -4.2\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-4.2 tagged_above=-999 required=5\r
+       tests=[BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3] autolearn=ham\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 qp3aayTHRDTT for <notmuch@notmuchmail.org>;\r
+       Tue, 27 Apr 2010 09:34:00 -0700 (PDT)\r
+Received: from ipex3.johnshopkins.edu (ipex3.johnshopkins.edu\r
+       [128.220.161.140])\r
+       by olra.theworths.org (Postfix) with ESMTP id D801B431FC1\r
+       for <notmuch@notmuchmail.org>; Tue, 27 Apr 2010 09:33:59 -0700 (PDT)\r
+X-IronPort-AV: E=Sophos;i="4.52,280,1270440000"; d="scan'208";a="380295455"\r
+Received: from c-69-255-36-229.hsd1.md.comcast.net (HELO lucky)\r
+       ([69.255.36.229])\r
+       by ipex3.johnshopkins.edu with ESMTP/TLS/AES256-SHA;\r
+       27 Apr 2010 12:33:58 -0400\r
+Received: from jkr by lucky with local (Exim 4.69)\r
+       (envelope-from <jrosenthal@jhu.edu>)\r
+       id 1O6njR-0002Rq-3p; Tue, 27 Apr 2010 12:33:57 -0400\r
+From: Jesse Rosenthal <jrosenthal@jhu.edu>\r
+To: Notmuch developer list <notmuch@notmuchmail.org>\r
+Subject: [PATCH] emacs: Remove conditional from notmuch-fcc-initialization.\r
+User-Agent: Notmuch/0.3 (http://notmuchmail.org) Emacs/23.1.1\r
+       (i486-pc-linux-gnu)\r
+Date: Tue, 27 Apr 2010 12:33:57 -0400\r
+Message-ID: <87k4rskg7e.fsf@jhu.edu>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\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: Tue, 27 Apr 2010 16:34:00 -0000\r
+\r
+The fcc code would only initialize if notmuch-fcc-dirs was set. This was\r
+a problem if you reset the variable, or added the variable later during\r
+initialization. Now we always add the fcc hook, but it doesn't do\r
+anything unless notmuch-fcc-dirs are set.\r
+---\r
+ emacs/notmuch-maildir-fcc.el |    3 +--\r
+ 1 files changed, 1 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el\r
+index 8af6f00..d9a8f9b 100644\r
+--- a/emacs/notmuch-maildir-fcc.el\r
++++ b/emacs/notmuch-maildir-fcc.el\r
+@@ -47,7 +47,6 @@\r
+ (defun notmuch-fcc-initialization ()\r
+   "If notmuch-fcc-directories is set,\r
+    hook them into the message-fcc-handler-function"\r
+-(if (not (eq notmuch-fcc-dirs nil)) (progn\r
+     ;Set up the message-fcc-handler to move mails to the maildir in Fcc\r
+     ;The parameter is hardcoded to mark messages as "seen"\r
+     (setq message-fcc-handler-function\r
+@@ -57,7 +56,7 @@\r
+     ;(preferrably we would use message-header-setup-up, but notmuch-reply\r
+     ; munges headers after that is run, so it won't work for replies within\r
+     ; notmuch)\r
+-    (add-hook 'message-send-hook 'notmuch-fcc-header-setup))))\r
++    (add-hook 'message-send-hook 'notmuch-fcc-header-setup))\r
+ \r
+ (defun notmuch-fcc-header-setup ()\r
+   "Can be added to message-send-hook and will set the FCC header\r
+-- \r
+1.6.3.3\r
+\r