--- /dev/null
+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 243E3431FBC\r
+ for <notmuch@notmuchmail.org>; Mon, 3 Mar 2014 04:52:55 -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 HTot3KK5PAo0 for <notmuch@notmuchmail.org>;\r
+ Mon, 3 Mar 2014 04:52:48 -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 6DCC2431FBD\r
+ for <notmuch@notmuchmail.org>; Mon, 3 Mar 2014 04:52:48 -0800 (PST)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+ (envelope-from <bremner@tethera.net>)\r
+ id 1WKSMS-0008J3-31; Mon, 03 Mar 2014 08:52:48 -0400\r
+Received: (nullmailer pid 29626 invoked by uid 1000); Mon, 03 Mar 2014\r
+ 12:52:41 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/3] NEWS: note closing of bug\r
+ id:87wqhcxb5j.fsf@maritornes.cs.unb.ca\r
+Date: Mon, 3 Mar 2014 08:52:37 -0400\r
+Message-Id: <1393851159-29456-2-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.8.5.3\r
+In-Reply-To: <1393851159-29456-1-git-send-email-david@tethera.net>\r
+References: <1393849753-20678-1-git-send-email-david@tethera.net>\r
+ <1393851159-29456-1-git-send-email-david@tethera.net>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=UTF-8\r
+Content-Transfer-Encoding: 8bit\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: Mon, 03 Mar 2014 12:52:55 -0000\r
+\r
+This is also/originally Debian bug 737496, so close that too.\r
+---\r
+ NEWS | 8 ++++++++\r
+ debian/changelog | 7 +++++++\r
+ 2 files changed, 15 insertions(+)\r
+\r
+diff --git a/NEWS b/NEWS\r
+index 65679eb..799fd9a 100644\r
+--- a/NEWS\r
++++ b/NEWS\r
+@@ -8,6 +8,14 @@ Command-Line Interface\r
+ \r
+ The old format is still available with `--format=sup`.\r
+ \r
++Emacs Interface\r
++---------------\r
++\r
++Bug fix for saved searches with newlines in them.\r
++\r
++ Split lines confuse `notmuch count --batch`, so we remove embedded\r
++ newlines before calling notmuch count.\r
++\r
+ Notmuch 0.17 (2013-12-30)\r
+ =========================\r
+ \r
+diff --git a/debian/changelog b/debian/changelog\r
+index a419ace..37bb0f2 100644\r
+--- a/debian/changelog\r
++++ b/debian/changelog\r
+@@ -1,3 +1,10 @@\r
++notmuch (0.18-1) unstable; urgency=medium\r
++\r
++ * Bug fix: "insufficient sanitization of arguments to notmuch CLI",\r
++ thanks to Antoine Beaupré (Closes: #737496).\r
++\r
++ -- David Bremner <bremner@debian.org> Mon, 03 Mar 2014 08:23:03 -0400\r
++\r
+ notmuch (0.17-5) unstable; urgency=medium\r
+ \r
+ * Bug fix: "unowned directory after purge: /0755/", thanks to\r
+-- \r
+1.8.5.3\r
+\r