* [PATCH] emacs: wrap current search in parens when filtering
@ 2015-09-02 21:57 Uli Scholler
2015-09-03 7:32 ` Tomi Ollila
0 siblings, 1 reply; 8+ messages in thread
From: Uli Scholler @ 2015-09-02 21:57 UTC (permalink / raw)
To: notmuch; +Cc: Uli Scholler
When filtering the current search further with notmuch-search-filter,
wrap the current search in parens.
This fixes unexpected behavior when the current search is
complex (like "(tag:this and date:one_week_ago..) or tag:that").
---
emacs/notmuch.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index 5284e77..a98ec96 100644
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -989,7 +989,7 @@ current search results AND the additional query string provided."
query)))
(notmuch-search (if (string= notmuch-search-query-string "*")
grouped-query
- (concat notmuch-search-query-string " and " grouped-query)) notmuch-search-oldest-first)))
+ (concat "(" notmuch-search-query-string ") 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
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH] emacs: wrap current search in parens when filtering
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
0 siblings, 1 reply; 8+ messages in thread
From: Tomi Ollila @ 2015-09-03 7:32 UTC (permalink / raw)
To: Uli Scholler, notmuch
On Thu, Sep 03 2015, Uli Scholler <uli@scholler.net> wrote:
> When filtering the current search further with notmuch-search-filter,
> wrap the current search in parens.
>
> This fixes unexpected behavior when the current search is
> complex (like "(tag:this and date:one_week_ago..) or tag:that").
> ---
Looks like a fix!
But should this do the same "notmuch-search-disjunctive-regexp" check
which is done when building up `grouped-query' ?
Tomi
> emacs/notmuch.el | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/emacs/notmuch.el b/emacs/notmuch.el
> index 5284e77..a98ec96 100644
> --- a/emacs/notmuch.el
> +++ b/emacs/notmuch.el
> @@ -989,7 +989,7 @@ current search results AND the additional query string provided."
> query)))
> (notmuch-search (if (string= notmuch-search-query-string "*")
> grouped-query
> - (concat notmuch-search-query-string " and " grouped-query)) notmuch-search-oldest-first)))
> + (concat "(" notmuch-search-query-string ") 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
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH v2] emacs: wrap current search in parens when filtering
2015-09-03 7:32 ` Tomi Ollila
@ 2015-09-03 21:54 ` Uli Scholler
2015-09-06 2:35 ` David Bremner
0 siblings, 1 reply; 8+ messages in thread
From: Uli Scholler @ 2015-09-03 21:54 UTC (permalink / raw)
To: notmuch
Tomi Ollila <tomi.ollila@iki.fi> writes:
> But should this do the same "notmuch-search-disjunctive-regexp" check
> which is done when building up `grouped-query' ?
Here is an improved version of my patch:
---
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").
---
emacs/notmuch.el | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index 5284e77..e5e677f 100644
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -978,18 +978,26 @@ 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-maybe-group-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-maybe-group-query-string query))
+ (grouped-search-query (notmuch-maybe-group-query-string notmuch-search-query-string)))
+ (notmuch-search (if (string= grouped-search-query "*")
grouped-query
- (concat notmuch-search-query-string " and " grouped-query)) notmuch-search-oldest-first)))
+ (concat grouped-search-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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2] emacs: wrap current search in parens when filtering
2015-09-03 21:54 ` [PATCH v2] " Uli Scholler
@ 2015-09-06 2:35 ` David Bremner
2015-09-06 9:19 ` Tomi Ollila
0 siblings, 1 reply; 8+ messages in thread
From: David Bremner @ 2015-09-06 2:35 UTC (permalink / raw)
To: Uli Scholler, notmuch
Some pretty fussy comments follow. Probably I could have fixed these in
the time it took to write this message ;).
Uli Scholler <uli@scholler.net> writes:
> + (let ((grouped-query (notmuch-maybe-group-query-string query))
> + (grouped-search-query (notmuch-maybe-group-query-string notmuch-search-query-string)))
- I didn't find it very obvious which of these introduced variables was
which. I thought maybe "grouped-original-query" for the second
one. It's pretty subjective though, so your call.
- The lines get pretty long here. We try to keep code to 80 columns.
- Your revised patch isn't in quite the right format for git am;
the actual commit message get's lost. The unintuitive trick is to add
commentary in the patch after the ---
> + (notmuch-search (if (string= grouped-search-query "*")
> grouped-query
> - (concat notmuch-search-query-string " and " grouped-query)) notmuch-search-oldest-first)))
> + (concat grouped-search-query " and " grouped-query)) notmuch-search-oldest-first)))
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] emacs: wrap current search in parens when filtering
2015-09-06 2:35 ` David Bremner
@ 2015-09-06 9:19 ` Tomi Ollila
2015-09-06 21:29 ` [PATCH v3] " Uli Scholler
0 siblings, 1 reply; 8+ messages in thread
From: Tomi Ollila @ 2015-09-06 9:19 UTC (permalink / raw)
To: Uli Scholler, notmuch
On Sun, Sep 06 2015, David Bremner <david@tethera.net> wrote:
> Some pretty fussy comments follow. Probably I could have fixed these in
> the time it took to write this message ;).
>
> Uli Scholler <uli@scholler.net> writes:
>> + (let ((grouped-query (notmuch-maybe-group-query-string query))
>> + (grouped-search-query (notmuch-maybe-group-query-string notmuch-search-query-string)))
>
> - I didn't find it very obvious which of these introduced variables was
> which. I thought maybe "grouped-original-query" for the second
> one. It's pretty subjective though, so your call.
Yes, naming is hard. I have an additional suggestion:
notmuch-maybe-group-query-string could be written as
notmuch-group-disjunctive-query-string
> - The lines get pretty long here. We try to keep code to 80 columns.
In this case the status quo did not change -- e.g. one line that was
replaced was even longer. Anyway, shorter lines would be welcome
improvements.
> - Your revised patch isn't in quite the right format for git am;
> the actual commit message get's lost. The unintuitive trick is to add
> commentary in the patch after the ---
Yes. A good custom is to try to git-am the file before sending if it has
been edited after git format-patch is used to create it -- or even if it
not edited, to catch any indesired "whitespace" etc. additions..
Tomi
>
>> + (notmuch-search (if (string= grouped-search-query "*")
>> grouped-query
>> - (concat notmuch-search-query-string " and " grouped-query)) notmuch-search-oldest-first)))
>> + (concat grouped-search-query " and " grouped-query)) notmuch-search-oldest-first)))
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3] emacs: wrap current search in parens when filtering
2015-09-06 9:19 ` Tomi Ollila
@ 2015-09-06 21:29 ` Uli Scholler
2015-09-07 6:14 ` Tomi Ollila
2015-09-07 12:50 ` David Bremner
0 siblings, 2 replies; 8+ messages in thread
From: Uli Scholler @ 2015-09-06 21:29 UTC (permalink / raw)
To: notmuch; +Cc: Uli Scholler
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").
---
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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v3] emacs: wrap current search in parens when filtering
2015-09-06 21:29 ` [PATCH v3] " Uli Scholler
@ 2015-09-07 6:14 ` Tomi Ollila
2015-09-07 12:50 ` David Bremner
1 sibling, 0 replies; 8+ messages in thread
From: Tomi Ollila @ 2015-09-07 6:14 UTC (permalink / raw)
To: Uli Scholler, notmuch
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v3] emacs: wrap current search in parens when filtering
2015-09-06 21:29 ` [PATCH v3] " Uli Scholler
2015-09-07 6:14 ` Tomi Ollila
@ 2015-09-07 12:50 ` David Bremner
1 sibling, 0 replies; 8+ messages in thread
From: David Bremner @ 2015-09-07 12:50 UTC (permalink / raw)
To: Uli Scholler, notmuch; +Cc: Uli Scholler
Uli Scholler <uli@scholler.net> writes:
> When filtering the current search further with notmuch-search-filter,
> wrap the current search in parens (if necessary).
>
merged to master. Thanks for your patience ;).
d
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-09-07 12:58 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2015-09-07 12:50 ` David Bremner
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).