diff options
| author |  Mark Walters <markwalters1009@gmail.com> | 2013-11-01 09:23:41 +0000 |
|---|---|---|
| committer |  David Bremner <david@tethera.net> | 2013-11-07 07:47:25 -0400 |
| commit | 66612063813c8c6179eb06dd83a75be6c427b215 (patch) | |
| tree | 08001d6fb5c865658c50e0d2b00eb1be657eb025 /emacs | |
| parent | 7d7c702d7290c049dd59383e4b1e28ab4280eb1c (diff) | |
emacs: minimal change to load notmuch-tree by default
We want to load notmuch-tree when notmuch is loaded, so include it as
a require in notmuch.el. To avoid circular dependency we need to move
one keybinding from notmuch-tree.el to notmuch.el: it makes sense for
it to be defined there anyway.
Since tree is now loaded by default there is no need to print a
message when it is loaded.
Diffstat (limited to 'emacs')
| -rw-r--r-- | emacs/notmuch-tree.el | 3 | ||||
| -rw-r--r-- | emacs/notmuch.el | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el index d3330a06..ebfb5e7b 100644 --- a/emacs/notmuch-tree.el +++ b/emacs/notmuch-tree.el @@ -29,7 +29,6 @@ (require 'notmuch-show) (require 'notmuch-tag) (require 'notmuch-parser) -(require 'notmuch) ;; XXX ATM, as notmuch-search-mode-map is defined here (eval-when-compile (require 'cl)) (declare-function notmuch-search "notmuch" (&optional query oldest-first target-thread target-line)) @@ -939,8 +938,6 @@ The arguments are: ;; Set up key bindings from the rest of notmuch. (define-key notmuch-common-keymap "z" 'notmuch-tree) -(define-key notmuch-search-mode-map "Z" 'notmuch-tree-from-search-current-query) (define-key notmuch-show-mode-map "Z" 'notmuch-tree-from-show-current-query) -(message "Initialised notmuch-tree") (provide 'notmuch-tree) diff --git a/emacs/notmuch.el b/emacs/notmuch.el index 19210cbe..418c7812 100644 --- a/emacs/notmuch.el +++ b/emacs/notmuch.el @@ -54,6 +54,7 @@ (require 'notmuch-lib) (require 'notmuch-tag) (require 'notmuch-show) +(require 'notmuch-tree) (require 'notmuch-mua) (require 'notmuch-hello) (require 'notmuch-maildir-fcc) @@ -156,6 +157,7 @@ To enter a line break in customize, press \\[quoted-insert] C-j." (define-key map "-" 'notmuch-search-remove-tag) (define-key map "+" 'notmuch-search-add-tag) (define-key map (kbd "RET") 'notmuch-search-show-thread) + (define-key map "Z" 'notmuch-tree-from-search-current-query) map) "Keymap for \"notmuch search\" buffers.") (fset 'notmuch-search-mode-map notmuch-search-mode-map) |