Re: [PATCH] emacs: remove newlines from input to notmuch count --batch

diff --git a/da/dfd59adab4ba274323dad36e1c77fedd1cd488 b/da/dfd59adab4ba274323dad36e1c77fedd1cd488
new file mode 100644 (file)
index 0000000..ea455ae
--- /dev/null
+++ b/da/dfd59adab4ba274323dad36e1c77fedd1cd488
@@ -0,0 +1,100 @@
+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 olra.theworths.org (Postfix) with ESMTP id 1E98F431FBD\r
+       for <notmuch@notmuchmail.org>; Sat,  8 Feb 2014 10:31:31 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id 1+J+UfApdreY for <notmuch@notmuchmail.org>;\r
+       Sat,  8 Feb 2014 10:31:25 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 871F3431FBC\r
+       for <notmuch@notmuchmail.org>; Sat,  8 Feb 2014 10:31:25 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id B89DC100033;\r
+       Sat,  8 Feb 2014 20:31:17 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] emacs: remove newlines from input to notmuch count\r
+ --batch\r
+In-Reply-To: <1391869517-2742-1-git-send-email-david@tethera.net>\r
+References: <m2sirzj3k0.fsf@guru.guru-group.fi>\r
+       <1391869517-2742-1-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.17+69~g761b031 (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: Sat, 08 Feb 2014 20:31:17 +0200\r
+Message-ID: <m2a9e1sbgq.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.13\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: Sat, 08 Feb 2014 18:31:31 -0000\r
+\r
+On Sat, Feb 08 2014, David Bremner <david@tethera.net> wrote:\r
+\r
+> Since a newline starts a new query in batch mode, this causes\r
+> mysterious crashes in the emacs interface if saved searches contain\r
+> newlines.  See the discussion at\r
+>\r
+>       id:87wqhcxb5j.fsf@maritornes.cs.unb.ca\r
+>\r
+> In general newlines seem to be just whitespace to the xapian query\r
+> parser, so this should be mainly harmless.\r
+> ---\r
+\r
+LGTM.\r
+\r
+Tomi\r
+\r
+\r
+>  emacs/notmuch-hello.el | 10 ++++++----\r
+>  1 file changed, 6 insertions(+), 4 deletions(-)\r
+>\r
+> diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el\r
+> index 7b3d76b..e325cd3 100644\r
+> --- a/emacs/notmuch-hello.el\r
+> +++ b/emacs/notmuch-hello.el\r
+> @@ -399,10 +399,12 @@ options will be handled as specified for\r
+>                           (third elem)\r
+>                         (cdr elem))))\r
+>      (insert\r
+> -     (notmuch-hello-filtered-query count-query\r
+> -                                   (or (plist-get options :filter-count)\r
+> -                                       (plist-get options :filter)))\r
+> -     "\n")))\r
+> +     (replace-regexp-in-string\r
+> +      "\n" " "\r
+> +      (notmuch-hello-filtered-query count-query\r
+> +                                    (or (plist-get options :filter-count)\r
+> +                                        (plist-get options :filter))))\r
+> +      "\n")))\r
+>  \r
+>      (unless (= (call-process-region (point-min) (point-max) notmuch-command\r
+>                                  t t nil "count" "--batch") 0)\r
+> -- \r
+> 1.8.5.2\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r