From 164110a45a1b4c2fe720426eae19a4cf0e763152 Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Sun, 30 Jan 2022 19:02:31 +0000
Subject: mail: notmuch has a better attachment checker

---
 notmuch.org | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'notmuch.org')

diff --git a/notmuch.org b/notmuch.org
index d433ecb..9fb3556 100644
--- a/notmuch.org
+++ b/notmuch.org
@@ -38,7 +38,7 @@
                          " "))
         (jao-minibuffer-refresh)))
 
-    (when jao-notmuch-enabled-p
+    (when jao-notmuch-enabled
       (jao-minibuffer-add-variable 'jao-notmuch-minibuffer-string -20))
   #+end_src
 * saved searches
@@ -198,21 +198,23 @@
 
     (use-package notmuch
       :init
-      :custom
-      ((notmuch-address-use-company nil)
-       (notmuch-address-command (if jao-notmuch-enabled-p 'internal 'as-is))
-       (notmuch-draft-folder "drafts")
-       (notmuch-draft-quoted-tags '("part"))
-       (notmuch-address-internal-completion '(received nil))
-       (notmuch-fcc-dirs
-        '(("\\(support\\|education\\)@bigml.com" . nil)
-          (".*@bigml.com" . "bigml/sent +bigml +sent -new")
-          (".*" . "jao/trove +jao +sent +trove -new")))
-       (notmuch-maildir-use-notmuch-insert t))
+      (setq notmuch-address-use-company nil
+            notmuch-address-command (if jao-notmuch-enabled 'internal 'as-is)
+            notmuch-always-prompt-for-sender t
+            notmuch-draft-folder "drafts"
+            notmuch-draft-quoted-tags '("part")
+            notmuch-address-internal-completion '(received nil)
+            notmuch-fcc-dirs
+            '(("\\(support\\|education\\)@bigml.com" . nil)
+              (".*@bigml.com" . "bigml/sent +bigml +sent -new")
+              (".*" . "jao/trove +jao +sent +trove -new"))
+            notmuch-maildir-use-notmuch-insert t)
 
       :config
 
-      (when jao-notmuch-enabled-p
+      (add-hook 'message-send-hook #'notmuch-mua-attachment-check)
+
+      (when jao-notmuch-enabled
         (define-key message-mode-map (kbd "C-c C-d") #'notmuch-draft-postpone)
         (setq message-directory "~/var/mail/"
               message-auto-save-directory "/tmp"
@@ -564,7 +566,7 @@
     #+end_src
 * html render
   #+begin_src emacs-lisp
-    (when jao-notmuch-enabled-p (setq mm-text-html-renderer 'shr))
+    (when jao-notmuch-enabled (setq mm-text-html-renderer 'shr))
   #+end_src
 * consult
   #+begin_src emacs-lisp
-- 
cgit v1.2.3