--- /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 CA56C431FBC\r
+ for <notmuch@notmuchmail.org>; Sun, 26 Jan 2014 10:54:33 -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 xQHK+HnVhMFx for <notmuch@notmuchmail.org>;\r
+ Sun, 26 Jan 2014 10:54:29 -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 E19BF431FC0\r
+ for <notmuch@notmuchmail.org>; Sun, 26 Jan 2014 10:54:28 -0800 (PST)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+ (envelope-from <bremner@tethera.net>)\r
+ id 1W7Uqi-0001r1-Hp; Sun, 26 Jan 2014 14:54:28 -0400\r
+Received: (nullmailer pid 18850 invoked by uid 1000); Sun, 26 Jan 2014\r
+ 18:54:24 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 3/3] emacs: add notmuch-assert-cli-sane to notmuch-hello\r
+Date: Sun, 26 Jan 2014 14:54:04 -0400\r
+Message-Id: <1390762444-18793-3-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.8.5.2\r
+In-Reply-To: <1390762444-18793-1-git-send-email-david@tethera.net>\r
+References: <5228989D.8030607@fifthhorseman.net>\r
+ <1390762444-18793-1-git-send-email-david@tethera.net>\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: Sun, 26 Jan 2014 18:54:34 -0000\r
+\r
+This is meant to be the friendly entrypoint, so let's do something\r
+better than the mangled output described in\r
+\r
+ id:5228989D.8030607@fifthhorseman.net\r
+---\r
+ emacs/notmuch-hello.el | 1 +\r
+ 1 file changed, 1 insertion(+)\r
+\r
+diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el\r
+index 55c416a..7b3d76b 100644\r
+--- a/emacs/notmuch-hello.el\r
++++ b/emacs/notmuch-hello.el\r
+@@ -788,6 +788,7 @@ following:\r
+ "Run notmuch and display saved searches, known tags, etc."\r
+ (interactive)\r
+ \r
++ (notmuch-assert-cli-sane)\r
+ ;; This may cause a window configuration change, so if the\r
+ ;; auto-refresh hook is already installed, avoid recursive refresh.\r
+ (let ((notmuch-hello-auto-refresh nil))\r
+-- \r
+1.8.5.2\r
+\r