summaryrefslogtreecommitdiff
path: root/emacs
diff options
context:
space:
mode:
authorDavid Edmondson <dme@dme.org>2010-04-26 16:07:04 +0100
committerCarl Worth <cworth@cworth.org>2010-04-26 10:37:35 -0700
commit98cf886120066c20d0f6a69c6dcfc50741badca5 (patch)
tree14c7e1ff8c3d10c0755f75ba581cb01e7584e7e5 /emacs
parent159b05fcaa8f9cf717bef74ca098d9567c85fe4c (diff)
emacs: `notmuch' should display the `notmuch-hello' interface
Reviewed-by: Carl Worth <cworth@cworth.org> The notmuch-hello functionality is now sufficiently useful that we want to make it the default view of notmuch for new users. This also effectively hides the "hello" name from the user, so we'll be free to change that in the implementation if necessary. This change also shuffles the requires between notmuch.el and notmuch-hello.el. This fixes things so that our documented (require 'notmuch) is sufficient for getting the notmuch-hello functionality. Finally, the shuffling caused the notmuch-search-oldest-first variable from one file to the other. While doing that, give this variable the defcustom treatment for easier customization.
Diffstat (limited to 'emacs')
-rw-r--r--emacs/notmuch-hello.el1
-rw-r--r--emacs/notmuch-lib.el5
-rw-r--r--emacs/notmuch.el7
3 files changed, 8 insertions, 5 deletions
diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
index 30b3a5e..bd882b8 100644
--- a/emacs/notmuch-hello.el
+++ b/emacs/notmuch-hello.el
@@ -24,7 +24,6 @@
(require 'cl)
(require 'notmuch-lib)
-(require 'notmuch)
(require 'notmuch-mua)
(declare-function notmuch-search "notmuch" (query &optional oldest-first target-thread target-line continuation))
diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
index 47c74b9..b64aeab 100644
--- a/emacs/notmuch-lib.el
+++ b/emacs/notmuch-lib.el
@@ -33,6 +33,11 @@
:type '(alist :key-type (string) :value-type (string))
:group 'notmuch)
+(defcustom notmuch-search-oldest-first t
+ "Show the oldest mail first when searching."
+ :type 'boolean
+ :group 'notmuch)
+
;;
(defun notmuch-version ()
diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index eecff23..428ae6c 100644
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -54,6 +54,7 @@
(require 'notmuch-lib)
(require 'notmuch-show)
(require 'notmuch-mua)
+(require 'notmuch-hello)
(defcustom notmuch-search-result-format
`(("date" . "%s ")
@@ -221,8 +222,6 @@ For a mouse binding, return nil."
(defvar notmuch-search-query-string)
(defvar notmuch-search-target-thread)
(defvar notmuch-search-target-line)
-(defvar notmuch-search-oldest-first t
- "Show the oldest mail first in the search-mode")
(defvar notmuch-search-continuation)
(defvar notmuch-search-disjunctive-regexp "\\<[oO][rR]\\>")
@@ -811,9 +810,9 @@ current search results AND that are tagged with the given tag."
;;;###autoload
(defun notmuch ()
- "Run notmuch to display all mail with tag of 'inbox'"
+ "Run notmuch and display saved searches, known tags, etc."
(interactive)
- (notmuch-search "tag:inbox" notmuch-search-oldest-first))
+ (notmuch-hello))
(setq mail-user-agent 'notmuch-user-agent)