debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-21 18:38:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

emacs: minimal change to load notmuch-tree by default

Browse source 
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.
This commit is contained in:
Mark Walters 2013-11-01 09:23:41 +00:00 committed by David Bremner
parent 7d7c702d72
commit 6661206381
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
emacs/notmuch-tree.el
View file

@ -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)

2
emacs/notmuch.el
View file

@ -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)