[PATCH 4/8] emacs: allow notmuch-tag to accept string inputs and prompt for tags
notmuch-tag is extended to accept various formats of the tag changes. In particular, user prompting for tag changes is now incorporated here, so it is common for modes. --- emacs/notmuch-tag.el | 20 +++- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/emacs/notmuch-tag.el b/emacs/notmuch-tag.el index b1848b4..ed59c2d 100644 --- a/emacs/notmuch-tag.el +++ b/emacs/notmuch-tag.el @@ -108,18 +108,26 @@ 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 tag-changes) +(defun notmuch-tag (query tag-changes) "Add/remove tags in TAG-CHANGES to messages matching QUERY. -TAG-CHANGES should be a list of strings of the form \"+tag\" or -\"-tag\" and QUERY should be a string containing the -search-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. 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 tag-changes query)) + (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'"))) @@ -128,7 +136,9 @@ 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))) +(run-hooks 'notmuch-after-tag-hook)) + ;; return the list of actual changed tags + tag-changes) ;; -- 1.7.9.1
[PATCH 4/8] emacs: allow notmuch-tag to accept string inputs and prompt for tags
notmuch-tag is extended to accept various formats of the tag changes. In particular, user prompting for tag changes is now incorporated here, so it is common for modes. --- emacs/notmuch-tag.el | 20 +++- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/emacs/notmuch-tag.el b/emacs/notmuch-tag.el index b1848b4..ed59c2d 100644 --- a/emacs/notmuch-tag.el +++ b/emacs/notmuch-tag.el @@ -108,18 +108,26 @@ 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 rest tag-changes) +(defun notmuch-tag (query optional tag-changes) Add/remove tags in TAG-CHANGES to messages matching QUERY. -TAG-CHANGES should be a list of strings of the form \+tag\ or -\-tag\ and QUERY should be a string containing the -search-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. 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 tag-changes query)) + (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'))) @@ -128,7 +136,9 @@ 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))) +(run-hooks 'notmuch-after-tag-hook)) + ;; return the list of actual changed tags + tag-changes) ;; -- 1.7.9.1 ___ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch
