X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-message.el;h=55e4cfee98cee93cc2e6f06591f0bad81b7cc1ca;hb=89f651a40374d07750528f45d555ce821c049c80;hp=264a5b9b496f483df94e0dde844b7d926712a6e2;hpb=643ce61c1babf6e73ca7e03fb907282e7ee3b176;p=notmuch
diff --git a/emacs/notmuch-message.el b/emacs/notmuch-message.el
index 264a5b9b..55e4cfee 100644
--- a/emacs/notmuch-message.el
+++ b/emacs/notmuch-message.el
@@ -1,4 +1,4 @@
-;; notmuch-message.el --- message-mode functions specific to notmuch
+;;; notmuch-message.el --- message-mode functions specific to notmuch
;;
;; Copyright © Jesse Rosenthal
;;
@@ -15,37 +15,38 @@
;; General Public License for more details.
;;
;; You should have received a copy of the GNU General Public License
-;; along with Notmuch. If not, see .
+;; along with Notmuch. If not, see .
;;
;; Authors: Jesse Rosenthal
+;;; Code:
+
(require 'message)
+(require 'notmuch-tag)
(require 'notmuch-mua)
-(defcustom notmuch-message-replied-tags '("replied")
- "Tags to be automatically added to or removed from a message when it is replied to.
-Any tag in the list will be added to a replied message or,
-if it is prefaced with a \"-\", removed.
+(defcustom notmuch-message-replied-tags '("+replied")
+ "List of tag changes to apply to a message when it has been replied to.
+
+Tags starting with \"+\" (or not starting with either \"+\" or
+\"-\") in the list will be added, and tags starting with \"-\"
+will be removed from the message being replied to.
For example, if you wanted to add a \"replied\" tag and remove
-the \"inbox\" and \"todo\", you would set
- (\"replied\" \"-inbox\" \"-todo\"\)"
- :type 'list
+the \"inbox\" and \"todo\" tags, you would set:
+ (\"+replied\" \"-inbox\" \"-todo\"\)"
+ :type '(repeat string)
:group 'notmuch-send)
(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)))))
+ (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)
(provide 'notmuch-message)
+
+;;; notmuch-message.el ends here