-(defun notmuch-message-mark-replied ()
- ;; get the in-reply-to header and parse it for the message id.
- (let ((rep (mail-header-parse-addresses (message-field-value "In-Reply-To"))))
- (when (and notmuch-message-replied-tags rep)
- ;; add a "+" to any tag that is doesn't already begin with a "+"
- ;; or "-"
- (let ((tags (mapcar (lambda (str)
- (if (not (string-match "^[+-]" str))
- (concat "+" str)
- str))
- notmuch-message-replied-tags)))
- (apply 'notmuch-tag (concat "id:" (car (car rep))) tags)))))
-
-(add-hook 'message-send-hook 'notmuch-message-mark-replied)
+(defconst notmuch-message-queued-tag-changes nil
+ "List of messages and corresponding tag-changes to be applied when sending a message.
+
+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)