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

diff --git a/ed/7040d313ea5d25230bcdac81dc0f1cc23668a9 b/ed/7040d313ea5d25230bcdac81dc0f1cc23668a9
new file mode 100644 (file)
index 0000000..e12bc25
--- /dev/null
+++ b/ed/7040d313ea5d25230bcdac81dc0f1cc23668a9
@@ -0,0 +1,96 @@
+Return-Path: <tomi.ollila@iki.fi>\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 3BDC16DE1A9F\r
+ for <notmuch@notmuchmail.org>; Sun,  6 Sep 2015 02:20:41 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 1.179\r
+X-Spam-Level: *\r
+X-Spam-Status: No, score=1.179 tagged_above=-999 required=5 tests=[AWL=-0.217,\r
+  SPF_NEUTRAL=0.652, URIBL_SBL=0.644, URIBL_SBL_A=0.1] 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 KKAizB-bMSeG for <notmuch@notmuchmail.org>;\r
+ Sun,  6 Sep 2015 02:20:38 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 32C726DE1A9E\r
+ for <notmuch@notmuchmail.org>; Sun,  6 Sep 2015 02:20:37 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+ by guru.guru-group.fi (Postfix) with ESMTP id 35DD3100033;\r
+ Sun,  6 Sep 2015 12:19:08 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Uli Scholler <uli@scholler.net>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v2] emacs: wrap current search in parens when filtering\r
+In-Reply-To: <87oahgi8ab.fsf@maritornes.cs.unb.ca>\r
+References: <1441231034-9413-1-git-send-email-uli@scholler.net>\r
+ <m2zj142c0q.fsf@guru.guru-group.fi> <87io7rxj6k.fsf@tardis.scholler.priv>\r
+ <87oahgi8ab.fsf@maritornes.cs.unb.ca>\r
+User-Agent: Notmuch/0.20.2+68~g0c35549 (http://notmuchmail.org) Emacs/24.3.1\r
+ (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+ $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+ !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Sun, 06 Sep 2015 12:19:07 +0300\r
+Message-ID: <m2mvwz29dg.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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: Sun, 06 Sep 2015 09:20:41 -0000\r
+\r
+On Sun, Sep 06 2015, David Bremner <david@tethera.net> wrote:\r
+\r
+> Some pretty fussy comments follow. Probably I could have fixed these in\r
+> the time it took to write this message ;).\r
+>\r
+> Uli Scholler <uli@scholler.net> writes:\r
+>> +  (let ((grouped-query (notmuch-maybe-group-query-string query))\r
+>> +   (grouped-search-query (notmuch-maybe-group-query-string notmuch-search-query-string)))\r
+>\r
+> - I didn't find it very obvious which of these introduced variables was\r
+>   which. I thought maybe "grouped-original-query" for the second\r
+>   one. It's pretty subjective though, so your call.\r
+\r
+Yes, naming is hard. I have an additional suggestion:\r
+\r
+notmuch-maybe-group-query-string could be written as\r
+notmuch-group-disjunctive-query-string\r
+\r
+> - The lines get pretty long here. We try to keep code to 80 columns.\r
+\r
+In this case the status quo did not change -- e.g. one line that was\r
+replaced was even longer. Anyway, shorter lines would be welcome\r
+improvements.\r
+\r
+> - Your revised patch isn't in quite the right format for git am;\r
+>   the actual commit message get's lost. The unintuitive trick is to add\r
+>   commentary in the patch after the ---\r
+\r
+Yes. A good custom is to try to git-am the file before sending if it has\r
+been edited after git format-patch is used to create it -- or even if it\r
+not edited, to catch any indesired "whitespace" etc. additions..\r
+\r
+\r
+Tomi\r
+\r
+>   \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
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r