From c662823eeb5f8213263ee59f592887569b4b3a28 Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Fri, 29 Oct 2021 06:09:03 +0100
Subject: no corfu in notmuch-message-mode, it wreaks havoc

---
 completion.org         | 1 +
 lib/net/jao-notmuch.el | 2 +-
 notmuch.org            | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/completion.org b/completion.org
index 8e506b1..eb3b52b 100644
--- a/completion.org
+++ b/completion.org
@@ -50,6 +50,7 @@
              (add-hook ',hook-name #'jao-corfu-enable-no-auto))))
 
       (jao-corfu-no-auto eshell)
+      (add-to-list 'corfu-excluded-modes 'notmuch-message-mode)
 
       :bind (:map corfu-map
                   ([remap next-line] . nil)
diff --git a/lib/net/jao-notmuch.el b/lib/net/jao-notmuch.el
index 5aad002..b9a9be9 100644
--- a/lib/net/jao-notmuch.el
+++ b/lib/net/jao-notmuch.el
@@ -250,7 +250,7 @@
         (forward-line 1)))
     (when cnt (list total match cnt))))
 
-(defvar jao-notmuch-tree-buffer-name-format "%Q [%N / %M] %n / %m")
+(defvar jao-notmuch-tree-buffer-name-format "%Q [%N / %M / %T] %n / %m / %t")
 
 (defun jao-notmuch-tree--format-name (query total match new ttotal tmatch tnew)
   (format-spec jao-notmuch-tree-buffer-name-format
diff --git a/notmuch.org b/notmuch.org
index 71e31ba..5d89ca5 100644
--- a/notmuch.org
+++ b/notmuch.org
@@ -168,7 +168,8 @@
 
     (use-package notmuch
       :custom
-      ((notmuch-draft-folder "jao/drafts")
+      ((notmuch-address-use-company nil)
+       (notmuch-draft-folder "jao/drafts")
        (notmuch-draft-quoted-tags '("part"))
        (notmuch-address-internal-completion '(received nil))
        (notmuch-fcc-dirs
-- 
cgit v1.2.3