From: Jesse Rosenthal <jrosenthal@jhu.edu>
Date: Tue, 27 Apr 2010 16:33:57 +0000 (-0400)
Subject: emacs: Remove conditional from notmuch-fcc-initialization.
X-Git-Tag: 0.3.1~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8fe3ee6f270efae66e7e0287e32f93a9b48c7a32;p=notmuch.git

emacs: Remove conditional from notmuch-fcc-initialization.

The fcc code would only initialize if notmuch-fcc-dirs was set. This was
a problem if you reset the variable, or added the variable later during
initialization. Now we always add the fcc hook, but it doesn't do
anything unless notmuch-fcc-dirs are set.
(cherry picked from commit 80a90787163690d2d87571327ba504a470798c60)
---

diff --git a/emacs/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el
index 8af6f009..d9a8f9b6 100644
--- a/emacs/notmuch-maildir-fcc.el
+++ b/emacs/notmuch-maildir-fcc.el
@@ -47,7 +47,6 @@
 (defun notmuch-fcc-initialization ()
   "If notmuch-fcc-directories is set,
    hook them into the message-fcc-handler-function"
-(if (not (eq notmuch-fcc-dirs nil)) (progn
     ;Set up the message-fcc-handler to move mails to the maildir in Fcc
     ;The parameter is hardcoded to mark messages as "seen"
     (setq message-fcc-handler-function
@@ -57,7 +56,7 @@
     ;(preferrably we would use message-header-setup-up, but notmuch-reply
     ; munges headers after that is run, so it won't work for replies within
     ; notmuch)
-    (add-hook 'message-send-hook 'notmuch-fcc-header-setup))))
+    (add-hook 'message-send-hook 'notmuch-fcc-header-setup))
 
 (defun notmuch-fcc-header-setup ()
   "Can be added to message-send-hook and will set the FCC header