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

emacs: modify search tag functions to use new notmuch-tag interface

Browse source 
The main change here is to modify argument parsing so as to not force
tag-changes to be a list, and to let notmuch-tag handle prompting the
user when required.  doc strings are also updated and cleaned up.
This commit is contained in:
Jameson Graef Rollins 2012-04-14 11:52:52 -07:00 committed by David Bremner
parent 97aa3c0659
commit dba0e53ea8
1 changed files with 13 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
emacs/notmuch.el
View file

@ -523,13 +523,10 @@ and will also appear in a buffer named \"*Notmuch errors*\"."
See `notmuch-search-tag-region' for details." See `notmuch-search-tag-region' for details."
(apply 'notmuch-search-tag-region (point) (point) tag-changes)) (apply 'notmuch-search-tag-region (point) (point) tag-changes))
(defun notmuch-search-tag-region (beg end &rest tag-changes) (defun notmuch-search-tag-region (beg end &optional tag-changes)
"Change tags for threads in the given region. "Change tags for threads in the given region."
TAGS is a list of tag operations for `notmuch-tag'. The tags are
added or removed for all threads in the region from BEG to END."
(let ((search-string (notmuch-search-find-thread-id-region-search beg end))) (let ((search-string (notmuch-search-find-thread-id-region-search beg end)))
(apply 'notmuch-tag search-string tag-changes) (setq tag-changes (funcall 'notmuch-tag search-string tag-changes))
(save-excursion (save-excursion
(let ((last-line (line-number-at-pos end)) (let ((last-line (line-number-at-pos end))
(max-line (- (line-number-at-pos (point-max)) 2))) (max-line (- (line-number-at-pos (point-max)) 2)))
@ -539,14 +536,14 @@ added or removed for all threads in the region from BEG to END."
(notmuch-update-tags (notmuch-search-get-tags) tag-changes)) (notmuch-update-tags (notmuch-search-get-tags) tag-changes))
(forward-line)))))) (forward-line))))))
(defun notmuch-search-tag (&optional initial-input) (defun notmuch-search-tag (&optional tag-changes)
"Change tags for the currently selected thread or region." "Change tags for the currently selected thread or region.
See `notmuch-tag' for information on the format of TAG-CHANGES."
(interactive) (interactive)
(let* ((beg (if (region-active-p) (region-beginning) (point))) (let* ((beg (if (region-active-p) (region-beginning) (point)))
(end (if (region-active-p) (region-end) (point))) (end (if (region-active-p) (region-end) (point))))
(search-string (notmuch-search-find-thread-id-region-search beg end)) (funcall 'notmuch-search-tag-region beg end tag-changes)))
(tags (notmuch-read-tag-changes initial-input search-string)))
(apply 'notmuch-search-tag-region beg end tags)))
(defun notmuch-search-add-tag () (defun notmuch-search-add-tag ()
"Same as `notmuch-search-tag' but sets initial input to '+'." "Same as `notmuch-search-tag' but sets initial input to '+'."
@ -789,18 +786,11 @@ non-authors is found, assume that all of the authors match."
(goto-char found-target))) (goto-char found-target)))
(delete-process proc)))) (delete-process proc))))
(defun notmuch-search-tag-all (&rest tag-changes) (defun notmuch-search-tag-all (&optional tag-changes)
"Add/remove tags from all matching messages. "Add/remove tags from all messages in current search buffer.
This command adds or removes tags from all messages matching the See `notmuch-tag' for information on the format of TAG-CHANGES."
current search terms. When called interactively, this command (interactive)
will prompt for tags to be added or removed. Tags prefixed with
'+' will be added and tags prefixed with '-' will be removed.
Each character of the tag name may consist of alphanumeric
characters as well as `_.+-'.
"
(interactive (notmuch-read-tag-changes))
(apply 'notmuch-tag notmuch-search-query-string tag-changes)) (apply 'notmuch-tag notmuch-search-query-string tag-changes))
(defun notmuch-search-buffer-title (query) (defun notmuch-search-buffer-title (query)