From: Austin Clements <amdragon@MIT.EDU>
To: notmuch@notmuchmail.org
Subject: [PATCH v2 8/8] emacs: Remove interactive behavior of `notmuch-tag'
Date: Tue, 22 Oct 2013 20:22:01 -0400 [thread overview]
Message-ID: <1382487721-31776-9-git-send-email-amdragon@mit.edu> (raw)
In-Reply-To: <1382487721-31776-1-git-send-email-amdragon@mit.edu>
We no longer use this, since we've lifted all interactive behavior to
the appropriate interactive entry points. Because of this,
`notmuch-tag' also no longer needs to return the tag changes list,
since the caller always passes it in.
---
emacs/notmuch-tag.el | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
diff --git a/emacs/notmuch-tag.el b/emacs/notmuch-tag.el
index 3ad53b2..7b21006 100644
--- a/emacs/notmuch-tag.el
+++ b/emacs/notmuch-tag.el
@@ -252,27 +252,18 @@ from TAGS if present."
(error "Changed tag must be of the form `+this_tag' or `-that_tag'")))))
(sort result-tags 'string<)))
-(defun notmuch-tag (query &optional tag-changes)
+(defun notmuch-tag (query tag-changes)
"Add/remove tags in TAG-CHANGES to messages matching QUERY.
QUERY should be a string containing the search-terms.
-TAG-CHANGES can take multiple forms. If TAG-CHANGES is a list of
-strings of the form \"+tag\" or \"-tag\" then those are the tag
-changes applied. If TAG-CHANGES is a string then it is
-interpreted as a single tag change. If TAG-CHANGES is the string
-\"-\" or \"+\", or null, then the user is prompted to enter the
-tag changes.
+TAG-CHANGES is a list of strings of the form \"+tag\" or
+\"-tag\" to add or remove tags, respectively.
Note: Other code should always use this function alter tags of
messages instead of running (notmuch-call-notmuch-process \"tag\" ..)
directly, so that hooks specified in notmuch-before-tag-hook and
notmuch-after-tag-hook will be run."
;; Perform some validation
- (if (string-or-null-p tag-changes)
- (if (or (string= tag-changes "-") (string= tag-changes "+") (null tag-changes))
- (setq tag-changes (notmuch-read-tag-changes
- (notmuch-tag-completions query) nil tag-changes))
- (setq tag-changes (list tag-changes))))
(mapc (lambda (tag-change)
(unless (string-match-p "^[-+]\\S-+$" tag-change)
(error "Tag must be of the form `+this_tag' or `-that_tag'")))
@@ -281,9 +272,7 @@ notmuch-after-tag-hook will be run."
(run-hooks 'notmuch-before-tag-hook)
(apply 'notmuch-call-notmuch-process "tag"
(append tag-changes (list "--" query)))
- (run-hooks 'notmuch-after-tag-hook))
- ;; in all cases we return tag-changes as a list
- tag-changes)
+ (run-hooks 'notmuch-after-tag-hook)))
(defun notmuch-tag-change-list (tags &optional reverse)
"Convert TAGS into a list of tag changes.
--
1.8.4.rc3
next prev parent reply other threads:[~2013-10-23 0:22 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-23 0:21 [PATCH v2 0/8] Improve tag change completion Austin Clements
2013-10-23 0:21 ` [PATCH v2 1/8] emacs: Fix misuse of `notmuch-tag' Austin Clements
2013-10-23 0:21 ` [PATCH v2 2/8] emacs: Take prompt and current tags in `notmuch-read-tag-changes' Austin Clements
2013-10-23 0:21 ` [PATCH v2 3/8] emacs: Use interactive specifications for tag changes in show Austin Clements
2013-10-23 0:21 ` [PATCH v2 4/8] emacs: Use interactive specifications for tag changes in search Austin Clements
2013-10-23 0:21 ` [PATCH v2 5/8] pick: Fix incorrect use of `notmuch-pick-tag' Austin Clements
2013-10-23 0:21 ` [PATCH v2 6/8] pick: Use list form of tag-changes in test Austin Clements
2013-10-23 0:22 ` [PATCH v2 7/8] pick: Use interactive specifications for tag changes Austin Clements
2013-10-23 0:22 ` Austin Clements [this message]
2013-10-23 16:06 ` [PATCH v2 0/8] Improve tag change completion Mark Walters
2013-10-23 18:28 ` Tomi Ollila
2013-10-26 0:37 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1382487721-31776-9-git-send-email-amdragon@mit.edu \
--to=amdragon@mit.edu \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).