From 45193bab16c728ba892a5d45fc62ef59e2a6ef85 Mon Sep 17 00:00:00 2001 From: Tim Quelch Date: Sat, 12 Sep 2020 14:45:40 +1000 Subject: [PATCH] emacs: Remove notmuch-mua-message-send-hook Currently `message-send-hook` functions are being called twice: In notmuch send common when `notmuch-mua-send-hook` functions are run (which by default includes `notmuch-mua-message-send-hook`) and in `message-send` itself. Because `message-send-hook` functions are run in `message-send` itself, we don't need also need to run them before we delegate to `message-send` Calling `notmuch-mua-message-send-hook` resulted in functions in `message-send-hook` to be called twice. This causes bugs in non-idempotent hook functions. --- emacs/notmuch-mua.el | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el index dcddca76..03c7cc97 100644 --- a/emacs/notmuch-mua.el +++ b/emacs/notmuch-mua.el @@ -40,7 +40,7 @@ ;; -(defcustom notmuch-mua-send-hook '(notmuch-mua-message-send-hook) +(defcustom notmuch-mua-send-hook nil "Hook run before sending messages." :type 'hook :group 'notmuch-send @@ -601,11 +601,6 @@ unencrypted. Really send? ")))) (interactive) (message-kill-buffer)) -(defun notmuch-mua-message-send-hook () - "The default function used for `notmuch-mua-send-hook', this -simply runs the corresponding `message-mode' hook functions." - (run-hooks 'message-send-hook)) - ;; (define-mail-user-agent 'notmuch-user-agent