[PATCH 2/3] emacs: add function notmuch-assert-cli-sane

diff --git a/8e/a0c28d31b4b742e4e57a1731b13d91bab1415b b/8e/a0c28d31b4b742e4e57a1731b13d91bab1415b
new file mode 100644 (file)
index 0000000..07f2229
--- /dev/null
+++ b/8e/a0c28d31b4b742e4e57a1731b13d91bab1415b
@@ -0,0 +1,76 @@
+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 25458431FBC\r
+       for <notmuch@notmuchmail.org>; Sun, 26 Jan 2014 10:54: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 mUuYG27WIx3m for <notmuch@notmuchmail.org>;\r
+       Sun, 26 Jan 2014 10:54:27 -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 62854431FBD\r
+       for <notmuch@notmuchmail.org>; Sun, 26 Jan 2014 10:54:27 -0800 (PST)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1W7Uqf-0001qr-3m; Sun, 26 Jan 2014 14:54:25 -0400\r
+Received: (nullmailer pid 18842 invoked by uid 1000); Sun, 26 Jan 2014\r
+       18:54:21 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/3] emacs: add function notmuch-assert-cli-sane\r
+Date: Sun, 26 Jan 2014 14:54:03 -0400\r
+Message-Id: <1390762444-18793-2-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:31 -0000\r
+\r
+If the CLI seems borked, signal an error, and log a suggestion for the\r
+user about how to recover.\r
+---\r
+ emacs/notmuch-lib.el | 7 +++++++\r
+ 1 file changed, 7 insertions(+)\r
+\r
+diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+index dcdfbdc..c195652 100644\r
+--- a/emacs/notmuch-lib.el\r
++++ b/emacs/notmuch-lib.el\r
+@@ -179,6 +179,13 @@ Otherwise the output will be returned"\r
+       (setq notmuch--cli-setup-p (= status 0))))\r
+   notmuch--cli-sane-p)\r
+ \r
++(defun notmuch-assert-cli-sane ()\r
++  (unless (notmuch-cli-sane-p)\r
++    (notmuch-logged-error\r
++     "notmuch cli seems misconfigured or unconfigured."\r
++"Perhaps you haven't run \"notmuch setup\" yet? Try running this\r
++on the command line, and then retry your notmuch command")))\r
++\r
+ (defun notmuch-version ()\r
+   "Return a string with the notmuch version number."\r
+   (let ((long-string\r
+-- \r
+1.8.5.2\r
+\r