[PATCH] emacs: `notmuch' should display the `notmuch-hello' interface

diff --git a/9c/ad065954c835309c1f5e7edb6a7dfa05a3df43 b/9c/ad065954c835309c1f5e7edb6a7dfa05a3df43
new file mode 100644 (file)
index 0000000..adbd31f
--- /dev/null
+++ b/9c/ad065954c835309c1f5e7edb6a7dfa05a3df43
@@ -0,0 +1,123 @@
+Return-Path: <dme@dme.org>\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 AC6E44196F3\r
+       for <notmuch@notmuchmail.org>; Mon, 26 Apr 2010 08:08:05 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.9\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.9 tagged_above=-999 required=5\r
+       tests=[BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001] autolearn=ham\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 uAmsned+rLOn for <notmuch@notmuchmail.org>;\r
+       Mon, 26 Apr 2010 08:08:04 -0700 (PDT)\r
+Received: from mail-bw0-f210.google.com (mail-bw0-f210.google.com\r
+       [209.85.218.210])\r
+       by olra.theworths.org (Postfix) with ESMTP id 30FCB431FC1\r
+       for <notmuch@notmuchmail.org>; Mon, 26 Apr 2010 08:08:04 -0700 (PDT)\r
+Received: by bwz2 with SMTP id 2so11248351bwz.30\r
+       for <notmuch@notmuchmail.org>; Mon, 26 Apr 2010 08:08:03 -0700 (PDT)\r
+Received: by 10.204.7.194 with SMTP id e2mr2666046bke.103.1272294482963;\r
+       Mon, 26 Apr 2010 08:08:02 -0700 (PDT)\r
+Received: from ut.hh.sledj.net (host83-217-165-81.dsl.vispa.com\r
+       [83.217.165.81])\r
+       by mx.google.com with ESMTPS id 14sm1517920bwz.6.2010.04.26.08.07.45\r
+       (version=TLSv1/SSLv3 cipher=RC4-MD5);\r
+       Mon, 26 Apr 2010 08:08:02 -0700 (PDT)\r
+Received: by ut.hh.sledj.net (Postfix, from userid 1000)\r
+       id E6FF459413B; Mon, 26 Apr 2010 16:07:07 +0100 (BST)\r
+From: dme@dme.org\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] emacs: `notmuch' should display the `notmuch-hello' interface\r
+Date: Mon, 26 Apr 2010 16:07:04 +0100\r
+Message-Id: <1272294424-17363-1-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 1.7.0\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, 26 Apr 2010 15:08:05 -0000\r
+\r
+From: David Edmondson <dme@dme.org>\r
+\r
+---\r
+ emacs/notmuch-hello.el |    1 -\r
+ emacs/notmuch-lib.el   |    5 +++++\r
+ emacs/notmuch.el       |    7 +++----\r
+ 3 files changed, 8 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el\r
+index 30b3a5e..bd882b8 100644\r
+--- a/emacs/notmuch-hello.el\r
++++ b/emacs/notmuch-hello.el\r
+@@ -24,7 +24,6 @@\r
+ (require 'cl)\r
+ \r
+ (require 'notmuch-lib)\r
+-(require 'notmuch)\r
+ (require 'notmuch-mua)\r
+ \r
+ (declare-function notmuch-search "notmuch" (query &optional oldest-first target-thread target-line continuation))\r
+diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+index 47c74b9..b64aeab 100644\r
+--- a/emacs/notmuch-lib.el\r
++++ b/emacs/notmuch-lib.el\r
+@@ -33,6 +33,11 @@\r
+   :type '(alist :key-type (string) :value-type (string))\r
+   :group 'notmuch)\r
+ \r
++(defcustom notmuch-search-oldest-first t\r
++  "Show the oldest mail first when searching."\r
++  :type 'boolean\r
++  :group 'notmuch)\r
++\r
+ ;;\r
+ \r
+ (defun notmuch-version ()\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index eecff23..428ae6c 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -54,6 +54,7 @@\r
+ (require 'notmuch-lib)\r
+ (require 'notmuch-show)\r
+ (require 'notmuch-mua)\r
++(require 'notmuch-hello)\r
+ \r
+ (defcustom notmuch-search-result-format\r
+   `(("date" . "%s ")\r
+@@ -221,8 +222,6 @@ For a mouse binding, return nil."\r
+ (defvar notmuch-search-query-string)\r
+ (defvar notmuch-search-target-thread)\r
+ (defvar notmuch-search-target-line)\r
+-(defvar notmuch-search-oldest-first t\r
+-  "Show the oldest mail first in the search-mode")\r
+ (defvar notmuch-search-continuation)\r
+ \r
+ (defvar notmuch-search-disjunctive-regexp      "\\<[oO][rR]\\>")\r
+@@ -811,9 +810,9 @@ current search results AND that are tagged with the given tag."\r
+ \r
+ ;;;###autoload\r
+ (defun notmuch ()\r
+-  "Run notmuch to display all mail with tag of 'inbox'"\r
++  "Run notmuch and display saved searches, known tags, etc."\r
+   (interactive)\r
+-  (notmuch-search "tag:inbox" notmuch-search-oldest-first))\r
++  (notmuch-hello))\r
+ \r
+ (setq mail-user-agent 'notmuch-user-agent)\r
+ \r
+-- \r
+1.7.0\r
+\r