reorg, tweak, take advantage of lexical binding

1 files changed, 16 insertions, 1 deletions

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 737a4f5a..465e1b3a 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -1017,6 +1017,7 @@ Passes ARG to `projectile-switch-project-by-name'."
   :if (and (spw--optional-pkg-available-p "dash") ; used in notmuch-config.el
            (spw--optional-pkg-available-p "notmuch"))
   :bind (("C-c s" . notmuch-search)
+
          :map notmuch-show-part-map
          ("C-c |" . spw--notmuch-import-gpg)
          ("a"     . spw--notmuch-show-apply-part-projectile)
@@ -1030,9 +1031,23 @@ Passes ARG to `projectile-switch-project-by-name'."
          :map notmuch-show-mode-map
          ;; ditto
          ("<f5>" . spw--spam-message)
-         ("<f7>" . spw--kill-thread))
+         ("<f7>" . spw--kill-thread)
+
+         :map notmuch-tree-mode-map
+         ("o" . spw--notmuch-tree-reader)
+         ("C" . spw--notmuch-tree-catchup)
+
+         ;; ditto
+         ("<f5>" . spw--spam-message)
+         ("<f7>" . spw--kill-thread)
+         ("<f9>" . spw--next-unread-group)
+
+         :map notmuch-message-mode-map
+         ("C-c C-s" . message-goto-subject))
+
   ;; defined in notmuch-config.el
   :commands (spw--init-notmuch-saved-searches)
+
   :init
   (use-package notmuch-hello
     :bind (("C-c h" . notmuch-hello)