From 054f87bed520566bf0216ef905a2569cdd343701 Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Sat, 13 Nov 2021 03:42:12 +0000
Subject: don't let notmuch interfere in address completion

---
 notmuch.org | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'notmuch.org')

diff --git a/notmuch.org b/notmuch.org
index 13843f0..9094c32 100644
--- a/notmuch.org
+++ b/notmuch.org
@@ -166,9 +166,10 @@
       (add-to-list 'load-path "/usr/local/share/emacs/site-lisp/"))
 
     (use-package notmuch
+      :init
       :custom
       ((notmuch-address-use-company nil)
-       (notmuch-draft-folder "jao/drafts")
+       (notmuch-draft-folder "jao.drafts")
        (notmuch-draft-quoted-tags '("part"))
        (notmuch-address-internal-completion '(received nil))
        (notmuch-fcc-dirs
@@ -180,7 +181,8 @@
 
       :config
 
-      (when (eq 'notmuch jao-afio-mail-function)
+      (when jao-notmuch-enabled-p
+        (define-key message-mode-map (kbd "C-c C-d") #'notmuch-draft-postpone)
         (setq message-directory "~/var/mail/"
               message-auto-save-directory "/tmp"
               mail-user-agent 'message-user-agent))
@@ -188,10 +190,7 @@
       :bind (:map notmuch-common-keymap
              (("E" . jao-notmuch-open-enclosure)
               ("B" . notmuch-show-resend-message)
-              ("b" . jao-notmuch-browse-urls))
-             :filter (eq 'notmuch jao-afio-mail-function)
-             :map message-mode-map
-             (("C-c C-d" . notmuch-draft-postpone))))
+              ("b" . jao-notmuch-browse-urls))))
 
     (use-package jao-notmuch :demand t)
 
-- 
cgit v1.2.3