debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-24 11:58:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

emacs: Use a buffer-local variable to update tags when sending replies

Browse source 
Instead of relying on the "In-Reply-To" header, use a buffer-local variable,
notmuch-message-queued-tag-changes, to add and remove tags to affected
messages when the message-send-hook is triggered.
This commit is contained in:
Örjan Ekeberg 2019-04-12 14:01:11 +02:00 committed by David Bremner
parent 3b807db52b
commit d9800c8932
2 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
emacs/notmuch-message.el
View file

@ -23,7 +23,6 @@
(require 'message) (require 'message)
(require 'notmuch-tag) (require 'notmuch-tag)
(require 'notmuch-mua)
(defcustom notmuch-message-replied-tags '("+replied") (defcustom notmuch-message-replied-tags '("+replied")
"List of tag changes to apply to a message when it has been replied to. "List of tag changes to apply to a message when it has been replied to.
@ -34,18 +33,26 @@ will be removed from the message being replied to.
For example, if you wanted to add a \"replied\" tag and remove For example, if you wanted to add a \"replied\" tag and remove
the \"inbox\" and \"todo\" tags, you would set: the \"inbox\" and \"todo\" tags, you would set:
(\"+replied\" \"-inbox\" \"-todo\"\)" (\"+replied\" \"-inbox\" \"-todo\")"
:type '(repeat string) :type '(repeat string)
:group 'notmuch-send) :group 'notmuch-send)
(defun notmuch-message-mark-replied () (defconst notmuch-message-queued-tag-changes nil
;; get the in-reply-to header and parse it for the message id. "List of messages and corresponding tag-changes to be applied when sending a message.
(let ((rep (mail-header-parse-addresses (message-field-value "In-Reply-To"))))
(when (and notmuch-message-replied-tags rep)
(notmuch-tag (notmuch-id-to-query (car (car rep)))
(notmuch-tag-change-list notmuch-message-replied-tags)))))
(add-hook 'message-send-hook 'notmuch-message-mark-replied) This variable is overridden by buffer-local versions in message
buffers where tag changes should be triggered when sending off
the message. Each item in this list is a list of strings, where
the first is a notmuch query and the rest are the tag changes to
be applied to the matching messages.")
(defun notmuch-message-apply-queued-tag-changes ()
;; Apply the tag changes queued in the buffer-local variable notmuch-message-queued-tag-changes.
(dolist (query-and-tags notmuch-message-queued-tag-changes)
(notmuch-tag (car query-and-tags)
(cdr query-and-tags))))
(add-hook 'message-send-hook 'notmuch-message-apply-queued-tag-changes)
(provide 'notmuch-message) (provide 'notmuch-message)

6
emacs/notmuch-mua.el
View file

@ -28,6 +28,7 @@
(require 'notmuch-lib) (require 'notmuch-lib)
(require 'notmuch-address) (require 'notmuch-address)
(require 'notmuch-draft) (require 'notmuch-draft)
(require 'notmuch-message)
(eval-when-compile (require 'cl)) (eval-when-compile (require 'cl))
@ -259,6 +260,11 @@ Typically this is added to `notmuch-mua-send-hook'."
(notmuch-headers-plist-to-alist reply-headers) (notmuch-headers-plist-to-alist reply-headers)
nil (notmuch-mua-get-switch-function)))) nil (notmuch-mua-get-switch-function))))
;; Create a buffer-local queue for tag changes triggered when sending the reply
(when notmuch-message-replied-tags
(setq-local notmuch-message-queued-tag-changes
(list (cons query-string notmuch-message-replied-tags))))
;; Insert the message body - but put it in front of the signature ;; Insert the message body - but put it in front of the signature
;; if one is present, and after any other content ;; if one is present, and after any other content
;; message*setup-hooks may have added to the message body already. ;; message*setup-hooks may have added to the message body already.