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 80a9078716)
This commit is contained in:
Jesse Rosenthal 2010-04-27 12:33:57 -04:00 committed by Carl Worth
parent 1b4a9de7c2
commit 8fe3ee6f27

View file

@ -47,7 +47,6 @@
(defun notmuch-fcc-initialization () (defun notmuch-fcc-initialization ()
"If notmuch-fcc-directories is set, "If notmuch-fcc-directories is set,
hook them into the message-fcc-handler-function" 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 ;Set up the message-fcc-handler to move mails to the maildir in Fcc
;The parameter is hardcoded to mark messages as "seen" ;The parameter is hardcoded to mark messages as "seen"
(setq message-fcc-handler-function (setq message-fcc-handler-function
@ -57,7 +56,7 @@
;(preferrably we would use message-header-setup-up, but notmuch-reply ;(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 ; munges headers after that is run, so it won't work for replies within
; notmuch) ; notmuch)
(add-hook 'message-send-hook 'notmuch-fcc-header-setup)))) (add-hook 'message-send-hook 'notmuch-fcc-header-setup))
(defun notmuch-fcc-header-setup () (defun notmuch-fcc-header-setup ()
"Can be added to message-send-hook and will set the FCC header "Can be added to message-send-hook and will set the FCC header