X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.el;h=65473ba70911fd0ab5bdc6e0f2e05b71dd72b2a9;hp=04c0fe70e903e7cbe85a69ceeeea3733b66b4ee7;hb=80483a92bef8dab659f81c1ae0eda05656a82510;hpb=92c4dcc641e9dfb5f65026ebae5cedc8eb1d9e21

diff --git a/notmuch.el b/notmuch.el
index 04c0fe70..65473ba7 100644
--- a/notmuch.el
+++ b/notmuch.el
@@ -809,8 +809,6 @@ view, (remove the \"inbox\" tag from each), with
 	mode-name "notmuch-show")
   (setq buffer-read-only t))
 
-;;;###autoload
-
 (defgroup notmuch nil
   "Notmuch mail reader for Emacs."
   :group 'mail)
@@ -1154,12 +1152,13 @@ characters as well as `_.+-'.
     (let ((words action-split))
       (when (null words) (error "No operation given"))
       (while words
-	(unless (string-match-p "^[\+\-][_\+\-\\w]+$" (car words))
+	(unless (string-match-p "^[-+][-+_.[:word:]]+$" (car words))
 	  (error "Action must be of the form `+thistag -that_tag'"))
 	(setq words (cdr words))))
     (apply 'notmuch-call-notmuch-process "tag"
 	   (append action-split (list notmuch-search-query-string) nil))))
 
+;;;###autoload
 (defun notmuch-search (query &optional oldest-first)
   "Run \"notmuch search\" with the given query string and display results."
   (interactive "sNotmuch search: ")
@@ -1239,6 +1238,8 @@ current search results AND that are tagged with the given tag."
    (list (notmuch-select-tag-with-completion "Filter by tag: ")))
   (notmuch-search (concat notmuch-search-query-string " and tag:" tag) notmuch-search-oldest-first))
 
+
+;;;###autoload
 (defun notmuch ()
   "Run notmuch to display all mail with tag of 'inbox'"
   (interactive)
@@ -1314,6 +1315,7 @@ results for the search terms in that line.
     (if search
 	(notmuch-search (cdr search) notmuch-search-oldest-first))))
 
+;;;###autoload
 (defun notmuch-folder ()
   "Show the notmuch folder view and update the displayed counts."
   (interactive)