diff options
| author | Uli Scholler <uli@scholler.net> | 2015-09-06 23:29:05 +0200 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2015-09-07 09:27:09 -0300 |
| commit | 9a5143abbcfbb008f846329b5c50b9322af5322a (patch) | |
| tree | 0af117bed11f97e55ccfeeb082fbf78589a0c8cc | |
| parent | bd5504ec10edf6a1442d92774dc06fafc0b46e3f (diff) | |
emacs: wrap current search in parens when filtering
When filtering the current search further with notmuch-search-filter,
wrap the current search in parens (if necessary).
This fixes unexpected behavior when the current search is
complex (like "(tag:this and date:one_week_ago..) or tag:that").
| -rw-r--r-- | emacs/notmuch.el | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/emacs/notmuch.el b/emacs/notmuch.el index 5284e771..463b9262 100644 --- a/emacs/notmuch.el +++ b/emacs/notmuch.el @@ -978,18 +978,28 @@ default sort order is defined by `notmuch-search-oldest-first'." (set 'notmuch-search-oldest-first (not notmuch-search-oldest-first)) (notmuch-search-refresh-view)) +(defun notmuch-group-disjunctive-query-string (query-string) + "Group query if it contains a complex expression. + +Enclose QUERY-STRING in parentheses if it matches +`notmuch-search-disjunctive-regexp'." + (if (string-match-p notmuch-search-disjunctive-regexp query-string) + (concat "( " query-string " )") + query-string)) + (defun notmuch-search-filter (query) "Filter the current search results based on an additional query string. Runs a new search matching only messages that match both the current search results AND the additional query string provided." (interactive (list (notmuch-read-query "Filter search: "))) - (let ((grouped-query (if (string-match-p notmuch-search-disjunctive-regexp query) - (concat "( " query " )") - query))) - (notmuch-search (if (string= notmuch-search-query-string "*") + (let ((grouped-query (notmuch-group-disjunctive-query-string query)) + (grouped-original-query (notmuch-group-disjunctive-query-string + notmuch-search-query-string))) + (notmuch-search (if (string= grouped-original-query "*") grouped-query - (concat notmuch-search-query-string " and " grouped-query)) notmuch-search-oldest-first))) + (concat grouped-original-query " and " grouped-query)) + notmuch-search-oldest-first))) (defun notmuch-search-filter-by-tag (tag) "Filter the current search results based on a single tag. |