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

emacs: Remove interactive behavior of `notmuch-tag'

Browse source 
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.
This commit is contained in:
Austin Clements 2013-10-22 20:22:01 -04:00 committed by David Bremner
parent 438c224787
commit 45444eebe5
1 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
emacs/notmuch-tag.el
View file

@ -253,27 +253,18 @@ from TAGS if present."
(error "Changed tag must be of the form `+this_tag' or `-that_tag'"))))) (error "Changed tag must be of the form `+this_tag' or `-that_tag'")))))
(sort result-tags 'string<))) (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. "Add/remove tags in TAG-CHANGES to messages matching QUERY.
QUERY should be a string containing the search-terms. QUERY should be a string containing the search-terms.
TAG-CHANGES can take multiple forms. If TAG-CHANGES is a list of TAG-CHANGES is a list of strings of the form \"+tag\" or
strings of the form \"+tag\" or \"-tag\" then those are the tag \"-tag\" to add or remove tags, respectively.
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.
Note: Other code should always use this function alter tags of Note: Other code should always use this function alter tags of
messages instead of running (notmuch-call-notmuch-process \"tag\" ..) messages instead of running (notmuch-call-notmuch-process \"tag\" ..)
directly, so that hooks specified in notmuch-before-tag-hook and directly, so that hooks specified in notmuch-before-tag-hook and
notmuch-after-tag-hook will be run." notmuch-after-tag-hook will be run."
;; Perform some validation ;; 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) (mapc (lambda (tag-change)
(unless (string-match-p "^[-+]\\S-+$" tag-change) (unless (string-match-p "^[-+]\\S-+$" tag-change)
(error "Tag must be of the form `+this_tag' or `-that_tag'"))) (error "Tag must be of the form `+this_tag' or `-that_tag'")))
@ -282,9 +273,7 @@ notmuch-after-tag-hook will be run."
(run-hooks 'notmuch-before-tag-hook) (run-hooks 'notmuch-before-tag-hook)
(apply 'notmuch-call-notmuch-process "tag" (apply 'notmuch-call-notmuch-process "tag"
(append tag-changes (list "--" query))) (append tag-changes (list "--" query)))
(run-hooks 'notmuch-after-tag-hook)) (run-hooks 'notmuch-after-tag-hook)))
;; in all cases we return tag-changes as a list
tag-changes)
(defun notmuch-tag-change-list (tags &optional reverse) (defun notmuch-tag-change-list (tags &optional reverse)
"Convert TAGS into a list of tag changes. "Convert TAGS into a list of tag changes.