[PATCH v2] emacs: wrap current search in parens when filtering

diff --git a/76/c45a6b5508a2a36012827e0b2efabf5f86177c b/76/c45a6b5508a2a36012827e0b2efabf5f86177c
new file mode 100644 (file)
index 0000000..233525e
--- /dev/null
+++ b/76/c45a6b5508a2a36012827e0b2efabf5f86177c
@@ -0,0 +1,119 @@
+Return-Path: <scholler@fnb.tu-darmstadt.de>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 53B156DE1B96\r
+ for <notmuch@notmuchmail.org>; Thu,  3 Sep 2015 15:02:37 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.009\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.009 tagged_above=-999 required=5 tests=[AWL=-0.001,\r
+  T_HEADER_FROM_DIFFERENT_DOMAINS=0.01] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id j8vPUvJ_NQpO for <notmuch@notmuchmail.org>;\r
+ Thu,  3 Sep 2015 15:02:34 -0700 (PDT)\r
+X-Greylist: delayed 441 seconds by postgrey-1.35 at arlo;\r
+ Thu, 03 Sep 2015 15:02:34 PDT\r
+Received: from idun.ftbfs.de (idun.ftbfs.de [78.47.2.106])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 7C5576DE1B92\r
+ for <notmuch@notmuchmail.org>; Thu,  3 Sep 2015 15:02:34 -0700 (PDT)\r
+Received: from localhost (localidun [10.0.0.76])\r
+ by idun.ftbfs.de (Postfix) with ESMTP id 7FABCEC390\r
+ for <notmuch@notmuchmail.org>; Thu,  3 Sep 2015 23:55:09 +0200 (CEST)\r
+Received: from localhost ([10.0.0.76])\r
+ by localhost (idun.ftbfs.de [10.0.0.76]) (amavisd-new, port 2525)\r
+ with SMTP id 06987-29 for <notmuch@notmuchmail.org>;\r
+ Thu, 3 Sep 2015 23:55:09 +0200 (CEST)\r
+Received: from saga.ftbfs.de (unknown [10.0.0.77])\r
+ by idun.ftbfs.de (Postfix) with ESMTP id 19D3FEC38A\r
+ for <notmuch@notmuchmail.org>; Thu,  3 Sep 2015 23:55:08 +0200 (CEST)\r
+Received: by saga.ftbfs.de (Postfix, from userid 10)\r
+ id AC88B5C8AD; Thu,  3 Sep 2015 23:55:08 +0200 (CEST)\r
+Received: by tardis.scholler.priv (Postfix, from userid 1000)\r
+ id EE92B104; Thu,  3 Sep 2015 23:54:43 +0200 (CEST)\r
+From: Uli Scholler <uli@scholler.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2] emacs: wrap current search in parens when filtering\r
+In-Reply-To: <m2zj142c0q.fsf@guru.guru-group.fi>\r
+References: <1441231034-9413-1-git-send-email-uli@scholler.net>\r
+ <m2zj142c0q.fsf@guru.guru-group.fi>\r
+User-Agent: Notmuch/0.18.2 (http://notmuchmail.org) Emacs/24.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Thu, 03 Sep 2015 23:54:43 +0200\r
+Message-ID: <87io7rxj6k.fsf@tardis.scholler.priv>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-Virus-Scanned: at idun.ftbfs.de with p-bank undefined\r
+X-Mailman-Approved-At: Thu, 03 Sep 2015 22:38:13 -0700\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.18\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Thu, 03 Sep 2015 22:02:37 -0000\r
+\r
+Tomi Ollila <tomi.ollila@iki.fi> writes:\r
+> But should this do the same "notmuch-search-disjunctive-regexp" check \r
+> which is done when building up `grouped-query' ?\r
+\r
+Here is an improved version of my patch:\r
+---\r
+\r
+When filtering the current search further with notmuch-search-filter,\r
+wrap the current search in parens if necessary.\r
+\r
+This fixes unexpected behavior when the current search is\r
+complex (like "(tag:this and date:one_week_ago..) or tag:that").\r
+---\r
+ emacs/notmuch.el | 18 +++++++++++++-----\r
+ 1 file changed, 13 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index 5284e77..e5e677f 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -978,18 +978,26 @@ default sort order is defined by `notmuch-search-oldest-first'."\r
+   (set 'notmuch-search-oldest-first (not notmuch-search-oldest-first))\r
+   (notmuch-search-refresh-view))\r
+ \r
++(defun notmuch-maybe-group-query-string (query-string)\r
++  "Group query if it contains a complex expression.\r
++\r
++Enclose QUERY-STRING in parentheses if it matches\r
++`notmuch-search-disjunctive-regexp'."\r
++  (if (string-match-p notmuch-search-disjunctive-regexp query-string)\r
++      (concat "( " query-string " )")\r
++    query-string))\r
++\r
+ (defun notmuch-search-filter (query)\r
+   "Filter the current search results based on an additional query string.\r
+ \r
+ Runs a new search matching only messages that match both the\r
+ current search results AND the additional query string provided."\r
+   (interactive (list (notmuch-read-query "Filter search: ")))\r
+-  (let ((grouped-query (if (string-match-p notmuch-search-disjunctive-regexp query)\r
+-                         (concat "( " query " )")\r
+-                       query)))\r
+-    (notmuch-search (if (string= notmuch-search-query-string "*")\r
++  (let ((grouped-query (notmuch-maybe-group-query-string query))\r
++      (grouped-search-query (notmuch-maybe-group-query-string notmuch-search-query-string)))\r
++    (notmuch-search (if (string= grouped-search-query "*")\r
+                       grouped-query\r
+-                    (concat notmuch-search-query-string " and " grouped-query)) notmuch-search-oldest-first)))\r
++                    (concat grouped-search-query " and " grouped-query)) notmuch-search-oldest-first)))\r
+ \r
+ (defun notmuch-search-filter-by-tag (tag)\r
+   "Filter the current search results based on a single tag.\r
+-- \r
+2.1.4\r
+\r
+\r