summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Rosenthal <jrosenthal@jhu.edu>2010-04-27 12:33:57 -0400
committerCarl Worth <cworth@cworth.org>2010-04-27 11:10:50 -0700
commit8fe3ee6f270efae66e7e0287e32f93a9b48c7a32 (patch)
tree35aa5a4cb6fe7d03fe42c1d2609d17e4a2f566e1
parent1b4a9de7c21710f18c5341b2009af49bb942deaa (diff)
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)
-rw-r--r--emacs/notmuch-maildir-fcc.el3
1 files changed, 1 insertions, 2 deletions
diff --git a/emacs/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el
index 8af6f00..d9a8f9b 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