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: move tag format validation to `notmuch-tag' function

Browse source 
Before the change, tag format validation was done in
`notmuch-search-operate-all' function only.  The patch moves it down
to `notmuch-tag', so that all users of that function get input
validation.
This commit is contained in:
Dmitry Kurochkin 2012-02-05 11:13:42 +04:00 committed by David Bremner
parent cc3756aabe
commit 0adf05f578
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
emacs/notmuch.el
View file

@ -516,6 +516,12 @@ 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
(when (null tags) (error "No tags given"))
(mapc (lambda (tag)
(unless (string-match-p "^[-+][-+_.[:word:]]+$" tag)
(error "Tag must be of the form `+this_tag' or `-that_tag'")))
tags)
(run-hooks 'notmuch-before-tag-hook) (run-hooks 'notmuch-before-tag-hook)
(apply 'notmuch-call-notmuch-process (apply 'notmuch-call-notmuch-process
(append (list "tag") tags (list "--" query))) (append (list "tag") tags (list "--" query)))
@ -883,12 +889,6 @@ characters as well as `_.+-'.
(interactive (notmuch-select-tags-with-completion (interactive (notmuch-select-tags-with-completion
"Operations (+add -drop): notmuch tag " "Operations (+add -drop): notmuch tag "
'("+" "-"))) '("+" "-")))
;; Perform some validation
(when (null actions) (error "No operations given"))
(mapc (lambda (action)
(unless (string-match-p "^[-+][-+_.[:word:]]+$" action)
(error "Action must be of the form `+this_tag' or `-that_tag'")))
actions)
(apply 'notmuch-tag notmuch-search-query-string actions)) (apply 'notmuch-tag notmuch-search-query-string actions))
(defun notmuch-search-buffer-title (query) (defun notmuch-search-buffer-title (query)