Compile and load notmuch-pick.el if present. All the actual setup of pick is done in the function notmuch-pick-init so we call that in the notmuch init function if it is bound. This function will setup all extra keybinding etc. --- emacs/Makefile.local | 3 ++- emacs/notmuch.el | 5 +++++ 2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/emacs/Makefile.local b/emacs/Makefile.local index fb82247..9f4dba6 100644 --- a/emacs/Makefile.local +++ b/emacs/Makefile.local @@ -15,7 +15,8 @@ emacs_sources := \ $(dir)/notmuch-crypto.el \ $(dir)/notmuch-tag.el \ $(dir)/coolj.el \ - $(dir)/notmuch-print.el + $(dir)/notmuch-print.el \ + $(wildcard $(dir)/notmuch-pick.el) emacs_images := \ $(srcdir)/$(dir)/notmuch-logo.png diff --git a/emacs/notmuch.el b/emacs/notmuch.el index fd1836f..4f3da4f 100644 --- a/emacs/notmuch.el +++ b/emacs/notmuch.el @@ -59,6 +59,9 @@ (require 'notmuch-maildir-fcc) (require 'notmuch-message) +;; Load notmuch-pick if available (but do not error if not present). +(load "notmuch-pick" t) + (defcustom notmuch-search-result-format `(("date" . "%12s ") ("count" . "%-7s ") @@ -1088,6 +1091,8 @@ current search results AND that are tagged with the given tag." (defun notmuch () "Run notmuch and display saved searches, known tags, etc." (interactive) + (when (fboundp 'notmuch-pick-init) + (notmuch-pick-init)) (notmuch-hello)) (defun notmuch-interesting-buffer (b) -- 1.7.9.1 _______________________________________________ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch