1 files changed, 15 insertions, 9 deletions

@@ -15,7 +15,7 @@
                                    :key-type (symbol :tag "Variable")
                                    :value-type (sexp :tag "Value"))))
 
-(defcustom +notmuch-spam-tags '("+spam")
+(defcustom +notmuch-spam-tags '("+spam -inbox -unread")
   "List of tag changes to apply when marking a thread as spam."
   :group 'notmuch
   :type '(repeat string))
@@ -133,15 +133,17 @@ the saved search as well."
   (interactive)
   (if (require 'async nil t)
       (progn
-        (message "Polling mail async...")
+        (message "Polling mail (async)...")
         (async-start
          (lambda ()
-           (push "~/usr/share/emacs/site-lisp/" load-path)
-           (require 'notmuch-lib)
-           (notmuch-poll))
-         (lambda (result)
-           (message "%s" result))))
-    (user-error "Feature `async' not found!")))
+           (ignore-errors
+             (push "~/usr/share/emacs/site-lisp/" load-path)
+             (require 'notmuch-lib)
+             (notmuch-poll)))
+         (lambda (_)
+           (message "Polling mail (async)...done"))))
+    ;;(user-error "Feature `async' not found!")
+    (notmuch-poll)))
 
 
 ;;; Packages
@@ -180,7 +182,7 @@ the saved search as well."
           notmuch-search-oldest-first nil
           notmuch-archive-tags '("-inbox" "-unread")
           notmuch-draft-tags '("+draft" "-inbox" "-unread")
-          +notmuch-spam-tags '("+spam" "+Spam")
+          +notmuch-spam-tags '("+spam")
           mail-user-agent 'notmuch-user-agent
           message-mail-user-agent t
           notmuch-show-indent-content nil
@@ -253,5 +255,9 @@ This version doesn't add any initial-input."
   ;; Load init file
   (load notmuch-init-file :noerror))
 
+(use-package notmuch-tags
+  :load-path "~/src/emacs/notmuch-tags.el/"
+  :commands (notmuch-tags-mode))
+
 (provide 'acdw-mail)
 ;;; acdw-mail.el ends here