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

diff --git a/b6/3718c0938cdc79dd091a68a87d93ba36f3a3a5 b/b6/3718c0938cdc79dd091a68a87d93ba36f3a3a5
new file mode 100644 (file)
index 0000000..934c879
--- /dev/null
+++ b/b6/3718c0938cdc79dd091a68a87d93ba36f3a3a5
@@ -0,0 +1,84 @@
+Return-Path: <bremner@tethera.net>\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 BE44A431FBD\r
+       for <notmuch@notmuchmail.org>; Sat,  8 Feb 2014 06:25:35 -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 gKdHtWkvNPwv for <notmuch@notmuchmail.org>;\r
+       Sat,  8 Feb 2014 06:25:28 -0800 (PST)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id D97BE431FBC\r
+       for <notmuch@notmuchmail.org>; Sat,  8 Feb 2014 06:25:27 -0800 (PST)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1WC8qV-0003Cr-Ea; Sat, 08 Feb 2014 10:25:27 -0400\r
+Received: (nullmailer pid 2779 invoked by uid 1000); Sat, 08 Feb 2014\r
+       14:25:23 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] emacs: remove newlines from input to notmuch count --batch\r
+Date: Sat,  8 Feb 2014 10:25:17 -0400\r
+Message-Id: <1391869517-2742-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.8.5.2\r
+In-Reply-To: <m2sirzj3k0.fsf@guru.guru-group.fi>\r
+References: <m2sirzj3k0.fsf@guru.guru-group.fi>\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 14:25:40 -0000\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
+ 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