From: Tomi Ollila <tomi.ollila@iki.fi>
To: Uli Scholler <uli@scholler.net>, notmuch@notmuchmail.org
Subject: Re: [PATCH v3] emacs: wrap current search in parens when filtering
Date: Mon, 07 Sep 2015 09:14:33 +0300 [thread overview]
Message-ID: <m2r3maiwmu.fsf@guru.guru-group.fi> (raw)
In-Reply-To: <1441574945-28437-1-git-send-email-uli@scholler.net>
On Mon, Sep 07 2015, Uli Scholler <uli@scholler.net> wrote:
> 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").
> ---
LGTM. Works fine (the first time I used 'f', which is just too bad ;/) +1
Tomi
> emacs/notmuch.el | 20 +++++++++++++++-----
> 1 file changed, 15 insertions(+), 5 deletions(-)
>
> diff --git a/emacs/notmuch.el b/emacs/notmuch.el
> index 5284e77..463b926 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.
> --
> 2.1.4
>
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch
next prev parent reply other threads:[~2015-09-07 6:16 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-02 21:57 [PATCH] emacs: wrap current search in parens when filtering Uli Scholler
2015-09-03 7:32 ` Tomi Ollila
2015-09-03 21:54 ` [PATCH v2] " Uli Scholler
2015-09-06 2:35 ` David Bremner
2015-09-06 9:19 ` Tomi Ollila
2015-09-06 21:29 ` [PATCH v3] " Uli Scholler
2015-09-07 6:14 ` Tomi Ollila [this message]
2015-09-07 12:50 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m2r3maiwmu.fsf@guru.guru-group.fi \
--to=tomi.ollila@iki.fi \
--cc=notmuch@notmuchmail.org \
--cc=uli@scholler.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).