[elpa] externals/ebdb a961744cc4: Adjust Notmuch insinuation

[Eric Abrahamsen]

branch: externals/ebdb
commit a961744cc49a6e9b96474ef8ea90dc34feaef24c
Author: Eric Abrahamsen <eric@ericabrahamsen.net>
Commit: Eric Abrahamsen <eric@ericabrahamsen.net>

    Adjust Notmuch insinuation
    
    notmuch-show-mode and notmuch-message-mode may be invoked in different
    orders, so provide separate hooks for each.
---
 ebdb-notmuch.el | 16 +++++++++-------
 ebdb.el         |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ebdb-notmuch.el b/ebdb-notmuch.el
index 5e8a70cf16..edc7d2dfeb 100644
--- a/ebdb-notmuch.el
+++ b/ebdb-notmuch.el
@@ -62,15 +62,17 @@ the value of `ebdb-default-window-size'."
 (cl-defmethod ebdb-popup-window (&context (major-mode notmuch-show-mode))
   (list (get-buffer-window) ebdb-notmuch-window-size))
 
-(defun ebdb-insinuate-notmuch ()
-  "Hook EBDB into Notmuch."
-  (define-key notmuch-show-mode-map ";" ebdb-mua-keymap)
+(defun ebdb-insinuate-notmuch-show ()
+  "Hook EBDB into Notmuch's `notmuch-show-mode'."
+  (define-key notmuch-show-mode-map ";" ebdb-mua-keymap))
+
+(defun ebdb-insinuate-notmuch-message ()
+  "Hook EBDB into Notmuch's `notmuch-message-mode'."
   (when ebdb-complete-mail
-    (with-eval-after-load "notmuch-message"
-      (define-key notmuch-message-mode-map (kbd "TAB") #'ebdb-complete-mail))))
+    (define-key notmuch-message-mode-map (kbd "TAB") #'ebdb-complete-mail)))
 
-(add-hook 'notmuch-show-mode-hook #'ebdb-insinuate-notmuch)
-(add-hook 'notmuch-message-mode-hook #'ebdb-insinuate-notmuch)
+(add-hook 'notmuch-show-mode-hook #'ebdb-insinuate-notmuch-show)
+(add-hook 'notmuch-message-mode-hook #'ebdb-insinuate-notmuch-message)
 
 (provide 'ebdb-notmuch)
 ;;; ebdb-notmuch.el ends here
diff --git a/ebdb.el b/ebdb.el
index 065b30931c..870284545a 100644
--- a/ebdb.el
+++ b/ebdb.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2016-2022  Free Software Foundation, Inc.
 
-;; Version: 0.8.15
+;; Version: 0.8.16
 ;; Package-Requires: ((emacs "25.1") (seq "2.15"))
 
 ;; Maintainer: Eric Abrahamsen <eric@ericabrahamsen.net>